diff --git a/[refs] b/[refs]
index 8e08daf0f788..30da261c1132 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58e0d6ab02eb90e67720ef1c20ab606749a9ef29
+refs/heads/master: 6651b0ea9202541091f6c23ec8715122ea8cc1b0
diff --git a/trunk/arch/arm/plat-omap/fb.c b/trunk/arch/arm/plat-omap/fb.c
index 15d4d1657b17..a05ab5673556 100644
--- a/trunk/arch/arm/plat-omap/fb.c
+++ b/trunk/arch/arm/plat-omap/fb.c
@@ -175,11 +175,6 @@ void __init omapfb_reserve_sdram_memblock(void)
 			 reserved);
 }
 
-void omapfb_set_ctrl_platform_data(void *data)
-{
-	omapfb_config.ctrl_platform_data = data;
-}
-
 static int __init omap_init_fb(void)
 {
 	const struct omap_lcd_config *conf;
diff --git a/trunk/include/linux/omapfb.h b/trunk/include/linux/omapfb.h
index c0b018790f07..85cad31ca3d9 100644
--- a/trunk/include/linux/omapfb.h
+++ b/trunk/include/linux/omapfb.h
@@ -250,12 +250,10 @@ struct omapfb_mem_desc {
 struct omapfb_platform_data {
 	struct omap_lcd_config		lcd;
 	struct omapfb_mem_desc		mem_desc;
-	void				*ctrl_platform_data;
 };
 
 /* in arch/arm/plat-omap/fb.c */
 extern void omapfb_set_platform_data(struct omapfb_platform_data *data);
-extern void omapfb_set_ctrl_platform_data(void *pdata);
 extern void omapfb_reserve_sdram_memblock(void);
 
 #endif