[PATCH 3/3] Disable linux-omap version of menelaus

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 <kalle.valo@xxxxxxxxx>
---

 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
 obj-$(CONFIG_SENSORS_TSL2550)	+= tsl2550.o
 obj-$(CONFIG_TWL4030_POWEROFF)	+= twl4030-poweroff.o
 obj-$(CONFIG_TWL4030_PWRBUTTON)	+= twl4030-pwrbutton.o

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux