Merge source.mvista.com:/home/git/linux-omap-2.6

arch/arm/plat-omap/fb.c

@@ -95,6 +95,11 @@ void omapfb_reserve_mem(void)
 
 }
 
+void omapfb_set_ctrl_platform_data(void *data)
+{
+	omapfb_config.ctrl_platform_data = data;
+}
+
 static inline int omap_init_fb(void)
 {
 	const struct omap_lcd_config *conf;

include/asm-arm/arch-omap/omapfb.h

@@ -323,6 +323,7 @@ struct omapfb_device {
 struct omapfb_platform_data {
 	struct omap_lcd_config		lcd;
 	struct omapfb_mem_desc		mem_desc;
+	void				*ctrl_platform_data;
 };
 
 #ifdef CONFIG_ARCH_OMAP1
@@ -344,8 +345,9 @@ extern int  omapfb_update_window_async(struct fb_info *fbi,
 				       void (*callback)(void *),
 				       void *callback_data);
 
-/* in arch/arm/plat-omap/devices.c */
+/* in arch/arm/plat-omap/fb.c */
 extern void omapfb_reserve_mem(void);
+extern void omapfb_set_ctrl_platform_data(void *pdata);
 
 #endif /* __KERNEL__ */