From 78869bcb99eea1daa5c36d4456223ac3490a6fe5 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Tue, 20 Sep 2011 14:43:14 +0300
Subject: [PATCH] --- yaml --- r: 294331 b: refs/heads/master c:
 8f5e35a7942afe70eb0ba0d8193801b7989ae03a h: refs/heads/master i:   294329:
 5eed9abbd61197b45fad22fd0dc76c781f7e5f17   294327:
 bd82097b4fb883d7c53d87476c44a4d6d219443c v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/video/omap/omapfb.h | 25 +++++++++++++++++++++++++
 trunk/include/linux/omapfb.h      | 25 -------------------------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index bc15e36fb38b..276d4e62df4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82d5b3e2319c9d1ea46c95b1e8b0db66d6f05a84
+refs/heads/master: 8f5e35a7942afe70eb0ba0d8193801b7989ae03a
diff --git a/trunk/drivers/video/omap/omapfb.h b/trunk/drivers/video/omap/omapfb.h
index 3a5ab13845fc..07fe49878892 100644
--- a/trunk/drivers/video/omap/omapfb.h
+++ b/trunk/drivers/video/omap/omapfb.h
@@ -47,6 +47,31 @@
 
 struct omapfb_device;
 
+#ifdef CONFIG_ARCH_OMAP1
+#define OMAPFB_PLANE_NUM		1
+#else
+#define OMAPFB_PLANE_NUM		3
+#endif
+
+struct omapfb_mem_region {
+	u32		paddr;
+	void __iomem	*vaddr;
+	unsigned long	size;
+	u8		type;		/* OMAPFB_PLANE_MEM_* */
+	enum omapfb_color_format format;/* OMAPFB_COLOR_* */
+	unsigned	format_used:1;	/* Must be set when format is set.
+					 * Needed b/c of the badly chosen 0
+					 * base for OMAPFB_COLOR_* values
+					 */
+	unsigned	alloc:1;	/* allocated by the driver */
+	unsigned	map:1;		/* kernel mapped by the driver */
+};
+
+struct omapfb_mem_desc {
+	int				region_cnt;
+	struct omapfb_mem_region	region[OMAPFB_PLANE_NUM];
+};
+
 struct lcd_panel {
 	const char	*name;
 	int		config;		/* TFT/STN, signal inversion */
diff --git a/trunk/include/linux/omapfb.h b/trunk/include/linux/omapfb.h
index 03f52555ce63..7a8e0ea345eb 100644
--- a/trunk/include/linux/omapfb.h
+++ b/trunk/include/linux/omapfb.h
@@ -222,31 +222,6 @@ struct omapfb_display_info {
 
 #include <plat/board.h>
 
-#ifdef CONFIG_ARCH_OMAP1
-#define OMAPFB_PLANE_NUM		1
-#else
-#define OMAPFB_PLANE_NUM		3
-#endif
-
-struct omapfb_mem_region {
-	u32		paddr;
-	void __iomem	*vaddr;
-	unsigned long	size;
-	u8		type;		/* OMAPFB_PLANE_MEM_* */
-	enum omapfb_color_format format;/* OMAPFB_COLOR_* */
-	unsigned	format_used:1;	/* Must be set when format is set.
-					 * Needed b/c of the badly chosen 0
-					 * base for OMAPFB_COLOR_* values
-					 */
-	unsigned	alloc:1;	/* allocated by the driver */
-	unsigned	map:1;		/* kernel mapped by the driver */
-};
-
-struct omapfb_mem_desc {
-	int				region_cnt;
-	struct omapfb_mem_region	region[OMAPFB_PLANE_NUM];
-};
-
 struct omapfb_platform_data {
 	struct omap_lcd_config		lcd;
 };