diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2018-05-31 12:27:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-31 12:27:56 +0200 |
| commit | c52b5c5f96b217854a953689f65234f7448c7f47 (patch) | |
| tree | cb9e41e3c25965e550b28f5aa5467cce5983125a /arch/arm/mach-ep93xx/core.c | |
| parent | perf/x86: Store user space frame-pointer value on a sample (diff) | |
| parent | Merge tag 'nds32-for-linus-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux (diff) | |
| download | linux-dev-c52b5c5f96b217854a953689f65234f7448c7f47.tar.xz linux-dev-c52b5c5f96b217854a953689f65234f7448c7f47.zip | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-ep93xx/core.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index e70feec6fad5..0581ffbedddd 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c @@ -323,7 +323,7 @@ void __init ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr) /* All EP93xx devices use the same two GPIO pins for I2C bit-banging */ static struct gpiod_lookup_table ep93xx_i2c_gpiod_table = { - .dev_id = "i2c-gpio", + .dev_id = "i2c-gpio.0", .table = { /* Use local offsets on gpiochip/port "G" */ GPIO_LOOKUP_IDX("G", 1, NULL, 0, |