diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-12-16 15:48:13 +1100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2016-01-05 02:06:10 +0100 |
| commit | f199b2605c25a0076cdd5c6a9e7eece77f95ce61 (patch) | |
| tree | 8a55598d777838c6a02467ff870495734bc614ae /drivers/i2c | |
| parent | 90708ce22b4849194d195bad128e94a110426434 (diff) | |
| download | linux-stable-f199b2605c25a0076cdd5c6a9e7eece77f95ce61.tar.gz linux-stable-f199b2605c25a0076cdd5c6a9e7eece77f95ce61.tar.bz2 linux-stable-f199b2605c25a0076cdd5c6a9e7eece77f95ce61.zip | |
i2c: ibm_iic: rename i2c_timings struct due to clash with generic version
Fixes: e1dba01ca620 ("i2c: add generic routine to parse DT for timing information")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-ibm_iic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index ab492301581a..b6c080334297 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c @@ -99,7 +99,7 @@ static void dump_iic_regs(const char* header, struct ibm_iic_private* dev) #endif /* Bus timings (in ns) for bit-banging */ -static struct i2c_timings { +static struct ibm_iic_timings { unsigned int hd_sta; unsigned int su_sto; unsigned int low; @@ -241,7 +241,7 @@ static int iic_dc_wait(volatile struct iic_regs __iomem *iic, u8 mask) static int iic_smbus_quick(struct ibm_iic_private* dev, const struct i2c_msg* p) { volatile struct iic_regs __iomem *iic = dev->vaddr; - const struct i2c_timings* t = &timings[dev->fast_mode ? 1 : 0]; + const struct ibm_iic_timings *t = &timings[dev->fast_mode ? 1 : 0]; u8 mask, v, sda; int i, res; |