On Thu, Jan 22, 2009 at 06:23:34PM -0800, Tony Lindgren wrote: > * Felipe Balbi <[email protected]> [090122 05:27]: > > On Thu, Jan 22, 2009 at 03:19:20PM +0200, Kalle Valo wrote: > > > Fixes linker errors like this: > > > > > > drivers/i2c/built-in.o: In function `menelaus_set_vdcdc': > > > lp5521.c:(.text+0x3910): multiple definition of `menelaus_set_vdcdc' > > > drivers/mfd/built-in.o:menelaus.c:(.text+0x95c): first defined here > > > drivers/i2c/built-in.o: In function `menelaus_set_vio': > > > lp5521.c:(.text+0x3990): multiple definition of `menelaus_set_vio' > > > > > > Signed-off-by: Kalle Valo <[email protected]> > > > --- > > > > > > drivers/i2c/chips/Makefile | 1 - > > > 1 files changed, 0 insertions(+), 1 deletions(-) > > > > > > diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile > > > index b451369..d8bef8c 100644 > > > --- a/drivers/i2c/chips/Makefile > > > +++ b/drivers/i2c/chips/Makefile > > > @@ -18,7 +18,6 @@ obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o > > > obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o > > > obj-$(CONFIG_PCF8575) += pcf8575.o > > > obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o > > > -obj-$(CONFIG_MENELAUS) += menelaus.o > > I'll also remove drivers/i2c/chips/menelaus.c.
why, did this driver make its way to mainline with a different name then ?? Where did Jean move it ? -- balbi -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
