diff --git a/[refs] b/[refs]
index bd713e96f0e7..fc5aac24030e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f909ef6437a8388e3f1272c67ee29071f930bd6b
+refs/heads/master: ec621699031b298eadd7e364f65281291b19ea37
diff --git a/trunk/arch/arm/mach-mx2/devices.c b/trunk/arch/arm/mach-mx2/devices.c
index f81aa8a8fbb4..a0f1b3674327 100644
--- a/trunk/arch/arm/mach-mx2/devices.c
+++ b/trunk/arch/arm/mach-mx2/devices.c
@@ -229,7 +229,6 @@ struct platform_device mxc_nand_device = {
 	.resource = mxc_nand_resources,
 };
 
-#ifdef CONFIG_FB_IMX
 /*
  * lcdc:
  * - i.MX1: the basic controller
@@ -259,7 +258,6 @@ struct platform_device mxc_fb_device = {
 		.coherent_dma_mask = 0xFFFFFFFF,
 	},
 };
-#endif
 
 #ifdef CONFIG_MACH_MX27
 static struct resource mxc_fec_resources[] = {