Hi all, On Wed, 16 Dec 2015 15:48:13 +1100 Stephen Rothwell <[email protected]> wrote: > > After merging the i2c tree, today's linux-next build (powerpc > ppc44x_defconfig) failed like this: > > drivers/i2c/busses/i2c-ibm_iic.c:102:15: error: redefinition of 'struct > i2c_timings' > static struct i2c_timings { > ^ > In file included from drivers/i2c/busses/i2c-ibm_iic.c:42:0: > include/linux/i2c.h:424:8: note: originally defined here > struct i2c_timings { > ^ > > Caused by commit > > e1dba01ca620 ("i2c: add generic routine to parse DT for timing information") > > I have applied the following patch for today: > > From: Stephen Rothwell <[email protected]> > Date: Wed, 16 Dec 2015 15:34:10 +1100 > Subject: [PATCH] ii2c: 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 <[email protected]> > --- > drivers/i2c/busses/i2c-ibm_iic.c | 4 ++-- > 1 file 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..51154fada1df 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_i2c_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_i2c_timings* t = &timings[dev->fast_mode ? 1 : 0]; > u8 mask, v, sda; > int i, res; > > -- > 2.6.2
Ping? -- Cheers, Stephen Rothwell [email protected] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
