From 5b96abf2e9cc44a42760c14b913c80be855166d4 Mon Sep 17 00:00:00 2001
From: Igor Grinberg <grinberg@compulab.co.il>
Date: Wed, 29 Aug 2012 02:18:54 +0300
Subject: [PATCH] --- yaml --- r: 326499 b: refs/heads/master c:
 cc01272986862b49024b6663559bb89df00f9f1a h: refs/heads/master i:   326497:
 bcc919983e8dc579470deaa5e2769cfee6fddd21   326495:
 554e21e4f86adffd910afbb66d541af560459ee6 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-omap1/board-osk.c         |  1 +
 trunk/arch/arm/mach-omap1/board-palmte.c      |  1 +
 trunk/arch/arm/mach-omap1/board-palmtt.c      |  1 +
 trunk/arch/arm/mach-omap1/board-palmz71.c     |  1 +
 trunk/arch/arm/plat-omap/include/plat/board.h |  7 -------
 trunk/drivers/video/backlight/omap1_bl.c      |  2 +-
 trunk/include/linux/platform_data/omap1_bl.h  | 11 +++++++++++
 8 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 trunk/include/linux/platform_data/omap1_bl.h

diff --git a/[refs] b/[refs]
index 26f3c395c185..fefdce70011b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3927b3f78c46001a8bd268f901c7e54863c66726
+refs/heads/master: cc01272986862b49024b6663559bb89df00f9f1a
diff --git a/trunk/arch/arm/mach-omap1/board-osk.c b/trunk/arch/arm/mach-omap1/board-osk.c
index 8784705edb60..569b6872a2f6 100644
--- a/trunk/arch/arm/mach-omap1/board-osk.c
+++ b/trunk/arch/arm/mach-omap1/board-osk.c
@@ -39,6 +39,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/i2c/tps65010.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
diff --git a/trunk/arch/arm/mach-omap1/board-palmte.c b/trunk/arch/arm/mach-omap1/board-palmte.c
index 26bcb9defcdc..7bf00ba51bd6 100644
--- a/trunk/arch/arm/mach-omap1/board-palmte.c
+++ b/trunk/arch/arm/mach-omap1/board-palmte.c
@@ -28,6 +28,7 @@
 #include <linux/interrupt.h>
 #include <linux/apm-emulation.h>
 #include <linux/omapfb.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
diff --git a/trunk/arch/arm/mach-omap1/board-palmtt.c b/trunk/arch/arm/mach-omap1/board-palmtt.c
index 4d099446dfa8..2cce505dd8f6 100644
--- a/trunk/arch/arm/mach-omap1/board-palmtt.c
+++ b/trunk/arch/arm/mach-omap1/board-palmtt.c
@@ -27,6 +27,7 @@
 #include <linux/omapfb.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
diff --git a/trunk/arch/arm/mach-omap1/board-palmz71.c b/trunk/arch/arm/mach-omap1/board-palmz71.c
index 355980321c2d..45ab9f03fb85 100644
--- a/trunk/arch/arm/mach-omap1/board-palmz71.c
+++ b/trunk/arch/arm/mach-omap1/board-palmz71.c
@@ -30,6 +30,7 @@
 #include <linux/omapfb.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
diff --git a/trunk/arch/arm/plat-omap/include/plat/board.h b/trunk/arch/arm/plat-omap/include/plat/board.h
index 5938c729b6c0..d0bc46e235bc 100644
--- a/trunk/arch/arm/plat-omap/include/plat/board.h
+++ b/trunk/arch/arm/plat-omap/include/plat/board.h
@@ -19,13 +19,6 @@ struct omap_lcd_config {
 	u8   data_lines;
 };
 
-struct device;
-struct fb_info;
-struct omap_backlight_config {
-	int default_intensity;
-	int (*set_power)(struct device *dev, int state);
-};
-
 /* for TI reference platforms sharing the same debug card */
 extern int debug_card_init(u32 addr, unsigned gpio);
 
diff --git a/trunk/drivers/video/backlight/omap1_bl.c b/trunk/drivers/video/backlight/omap1_bl.c
index bfdc5fbeaa11..92257ef19403 100644
--- a/trunk/drivers/video/backlight/omap1_bl.c
+++ b/trunk/drivers/video/backlight/omap1_bl.c
@@ -27,9 +27,9 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/slab.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <mach/hardware.h>
-#include <plat/board.h>
 #include <plat/mux.h>
 
 #define OMAPBL_MAX_INTENSITY		0xff
diff --git a/trunk/include/linux/platform_data/omap1_bl.h b/trunk/include/linux/platform_data/omap1_bl.h
new file mode 100644
index 000000000000..881a8e92d605
--- /dev/null
+++ b/trunk/include/linux/platform_data/omap1_bl.h
@@ -0,0 +1,11 @@
+#ifndef __OMAP1_BL_H__
+#define __OMAP1_BL_H__
+
+#include <linux/device.h>
+
+struct omap_backlight_config {
+	int default_intensity;
+	int (*set_power)(struct device *dev, int state);
+};
+
+#endif