From: Tony Lindgren Date: Wed, 6 Aug 2008 09:47:49 +0000 (+0300) Subject: Fix compile for twl4030 and 3430 lcd X-Git-Tag: v2.6.26-omap1~10 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=016365936ce2bd371fee44103708f449851ba4f7;p=linux-2.6-omap-h63xx.git Fix compile for twl4030 and 3430 lcd Looks like recent patches broke compile. Signed-off-by: Tony Lindgren --- diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/i2c/chips/twl4030-core.c index 205245d2ec0..632431f435a 100644 --- a/drivers/i2c/chips/twl4030-core.c +++ b/drivers/i2c/chips/twl4030-core.c @@ -879,7 +879,7 @@ static int __init power_companion_init(void) * status register to ensure that any prior interrupts are cleared. * Returns the status from the I2C read operation. */ -static int __init twl4030_i2c_clear_isr(u8 mod_no, u8 reg) +static int __init twl4030_i2c_clear_isr(u8 mod_no, u8 reg, u8 cor) { u8 tmp; diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile index 662dff949ff..f9b5cd4b2e5 100644 --- a/drivers/video/omap/Makefile +++ b/drivers/video/omap/Makefile @@ -32,7 +32,6 @@ objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o -objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_3430sdp.o objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o