From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Sep 2011 02:16:03 +0000 (+1000)
Subject: Merge remote-tracking branch 'omap_dss2/for-next'
X-Git-Tag: next-20110930~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=756650ad011ea6f8d0c4141da7cc707386d91d96;p=karo-tx-linux.git

Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	drivers/video/omap/lcd_apollon.c
	drivers/video/omap/lcd_ldp.c
	drivers/video/omap/lcd_overo.c
---

756650ad011ea6f8d0c4141da7cc707386d91d96
diff --cc arch/arm/mach-omap2/board-4430sdp.c
index f3917b3e12d6,d3874a68b059..4d0c8b9c644a
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@@ -381,14 -379,12 +379,6 @@@ static struct platform_device *sdp4430_
  	&sdp4430_vbat,
  };
  
- static struct omap_lcd_config sdp4430_lcd_config __initdata = {
- 	.ctrl_name	= "internal",
- };
- 
- static struct omap_board_config_kernel sdp4430_config[] __initdata = {
- 	{ OMAP_TAG_LCD,		&sdp4430_lcd_config },
- };
 -static void __init omap_4430sdp_init_early(void)
 -{
 -	omap2_init_common_infrastructure();
 -	omap2_init_common_devices(NULL, NULL);
 -}
--
  static struct omap_musb_board_data musb_board_data = {
  	.interface_type		= MUSB_INTERFACE_UTMI,
  	.mode			= MUSB_OTG,