From 8af3a707eb1d7877d8634ca51010fc6ada620cc9 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Tue, 20 Sep 2011 15:35:37 +0300
Subject: [PATCH] --- yaml --- r: 294335 b: refs/heads/master c:
 5f1cc13fbf4cd0f798a08af2e0c04ae80ceac5e3 h: refs/heads/master i:   294333:
 3d44f0e873862ba5533d336ec8e5e32d5ea2aabf   294331:
 78869bcb99eea1daa5c36d4456223ac3490a6fe5   294327:
 bd82097b4fb883d7c53d87476c44a4d6d219443c   294319:
 a0ff11a6323ea88c1cc82f9ba155eaf74adc4c94   294303:
 c7214748ebb0a0ab5d0b930d1f39cc2458801b40   294271:
 5676b3efe97067a5c9d35fce1402617e76a07946 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/mach-omap1/board-fsample.c  | 6 ------
 trunk/arch/arm/mach-omap1/board-h2.c       | 6 ------
 trunk/arch/arm/mach-omap1/board-perseus2.c | 6 ------
 trunk/arch/arm/mach-omap1/board-sx1.c      | 6 ------
 5 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index cb452ee34201..50b1b36ae191 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b2240eff66cb44f1d1c7c2c2497ff50ad3d1538
+refs/heads/master: 5f1cc13fbf4cd0f798a08af2e0c04ae80ceac5e3
diff --git a/trunk/arch/arm/mach-omap1/board-fsample.c b/trunk/arch/arm/mach-omap1/board-fsample.c
index b00844f7414d..7afaf3c5bdc6 100644
--- a/trunk/arch/arm/mach-omap1/board-fsample.c
+++ b/trunk/arch/arm/mach-omap1/board-fsample.c
@@ -274,17 +274,11 @@ static struct platform_device kp_device = {
 	.resource	= kp_resources,
 };
 
-static struct platform_device lcd_device = {
-	.name		= "lcd_p2",
-	.id		= -1,
-};
-
 static struct platform_device *devices[] __initdata = {
 	&nor_device,
 	&nand_device,
 	&smc91x_device,
 	&kp_device,
-	&lcd_device,
 };
 
 static struct omap_lcd_config fsample_lcd_config = {
diff --git a/trunk/arch/arm/mach-omap1/board-h2.c b/trunk/arch/arm/mach-omap1/board-h2.c
index 471233fe147a..af2be8c12c07 100644
--- a/trunk/arch/arm/mach-omap1/board-h2.c
+++ b/trunk/arch/arm/mach-omap1/board-h2.c
@@ -326,18 +326,12 @@ static struct platform_device h2_irda_device = {
 	.resource	= h2_irda_resources,
 };
 
-static struct platform_device h2_lcd_device = {
-	.name		= "lcd_h2",
-	.id		= -1,
-};
-
 static struct platform_device *h2_devices[] __initdata = {
 	&h2_nor_device,
 	&h2_nand_device,
 	&h2_smc91x_device,
 	&h2_irda_device,
 	&h2_kp_device,
-	&h2_lcd_device,
 };
 
 static void __init h2_init_smc91x(void)
diff --git a/trunk/arch/arm/mach-omap1/board-perseus2.c b/trunk/arch/arm/mach-omap1/board-perseus2.c
index 44df93172653..8e0153447c6d 100644
--- a/trunk/arch/arm/mach-omap1/board-perseus2.c
+++ b/trunk/arch/arm/mach-omap1/board-perseus2.c
@@ -233,17 +233,11 @@ static struct platform_device kp_device = {
 	.resource	= kp_resources,
 };
 
-static struct platform_device lcd_device = {
-	.name		= "lcd_p2",
-	.id		= -1,
-};
-
 static struct platform_device *devices[] __initdata = {
 	&nor_device,
 	&nand_device,
 	&smc91x_device,
 	&kp_device,
-	&lcd_device,
 };
 
 static struct omap_lcd_config perseus2_lcd_config __initdata = {
diff --git a/trunk/arch/arm/mach-omap1/board-sx1.c b/trunk/arch/arm/mach-omap1/board-sx1.c
index 0c880be11276..0c76e12337d9 100644
--- a/trunk/arch/arm/mach-omap1/board-sx1.c
+++ b/trunk/arch/arm/mach-omap1/board-sx1.c
@@ -356,11 +356,6 @@ static struct omap_usb_config sx1_usb_config __initdata = {
 
 /*----------- LCD -------------------------*/
 
-static struct platform_device sx1_lcd_device = {
-	.name		= "lcd_sx1",
-	.id		= -1,
-};
-
 static struct omap_lcd_config sx1_lcd_config __initdata = {
 	.ctrl_name	= "internal",
 };
@@ -369,7 +364,6 @@ static struct omap_lcd_config sx1_lcd_config __initdata = {
 static struct platform_device *sx1_devices[] __initdata = {
 	&sx1_flash_device,
 	&sx1_kp_device,
-	&sx1_lcd_device,
 	&sx1_irda_device,
 };