From: Tony Lindgren Date: Tue, 8 Jul 2008 07:46:45 +0000 (+0300) Subject: Revert "Separate out 3430 LCD panel support from 2430 file" X-Git-Tag: v2.6.26-omap1~73 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bd58c8acf1947f133f1d7796caa8ffd6b5c3895;p=pandora-kernel.git Revert "Separate out 3430 LCD panel support from 2430 file" This reverts commit 754773053d37a8bfb6b255cbd773127c6ab0fcb9. Compile breaks and code is not being shared. Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 7a216cc4b87f..f6cd08b05bac 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -204,7 +204,7 @@ static struct spi_board_info sdp3430_spi_board_info[] __initdata = { }; static struct platform_device sdp3430_lcd_device = { - .name = "sdp3430_lcd", + .name = "sdp2430_lcd", .id = -1, }; diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile index a72a2d9a9afd..fe7ee5dd0978 100644 --- a/drivers/video/omap/Makefile +++ b/drivers/video/omap/Makefile @@ -30,7 +30,7 @@ objs-y$(CONFIG_MACH_SX1) += lcd_sx1.o 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_3430sdp.o +objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.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 Reading git-diff-tree failed