From: Kalle Valo Date: Thu, 22 Jan 2009 13:19:20 +0000 (+0200) Subject: Disable linux-omap version of menelaus X-Git-Tag: v2.6.29-omap1~119 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=675e66d8261d3327bc467426f8a7e15ec8ffad2c;p=pandora-kernel.git Disable linux-omap version of menelaus 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' Also remove drivers/i2c/chips/menelaus.c. Signed-off-by: Kalle Valo Signed-off-by: Tony Lindgren --- Reading git-diff-tree failed