diff --git a/[refs] b/[refs]
index 276d4e62df4b..0726c9e5a4a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f5e35a7942afe70eb0ba0d8193801b7989ae03a
+refs/heads/master: f060f95365ce71acbf29ef5dac580ab067600f4c
diff --git a/trunk/arch/arm/plat-omap/fb.c b/trunk/arch/arm/plat-omap/fb.c
index a742b60912cd..45f35c983f44 100644
--- a/trunk/arch/arm/plat-omap/fb.c
+++ b/trunk/arch/arm/plat-omap/fb.c
@@ -52,10 +52,6 @@ static struct platform_device omap_fb_device = {
 	.num_resources = 0,
 };
 
-void omapfb_set_platform_data(struct omapfb_platform_data *data)
-{
-}
-
 static int __init omap_init_fb(void)
 {
 	const struct omap_lcd_config *conf;
@@ -87,11 +83,6 @@ static struct platform_device omap_fb_device = {
 	.num_resources = 0,
 };
 
-void omapfb_set_platform_data(struct omapfb_platform_data *data)
-{
-	omapfb_config = *data;
-}
-
 static int __init omap_init_fb(void)
 {
 	return platform_device_register(&omap_fb_device);
@@ -99,10 +90,4 @@ static int __init omap_init_fb(void)
 
 arch_initcall(omap_init_fb);
 
-#else
-
-void omapfb_set_platform_data(struct omapfb_platform_data *data)
-{
-}
-
 #endif
diff --git a/trunk/include/linux/omapfb.h b/trunk/include/linux/omapfb.h
index 7a8e0ea345eb..a575706a83c3 100644
--- a/trunk/include/linux/omapfb.h
+++ b/trunk/include/linux/omapfb.h
@@ -226,9 +226,6 @@ struct omapfb_platform_data {
 	struct omap_lcd_config		lcd;
 };
 
-/* in arch/arm/plat-omap/fb.c */
-extern void omapfb_set_platform_data(struct omapfb_platform_data *data);
-
 #endif
 
 #endif /* __OMAPFB_H */