diff --git a/[refs] b/[refs]
index 5951cdb0b44b..d64dca158daf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e48ab1c16ff2af83e6a2a1228504710a5d339d08
+refs/heads/master: fd2fa2e3238197ef10101277dff67da10e68a61b
diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig
index 176984f22a07..6875cdfbb282 100644
--- a/trunk/arch/arm/mach-imx/Kconfig
+++ b/trunk/arch/arm/mach-imx/Kconfig
@@ -17,9 +17,8 @@ config SOC_IMX21
 config SOC_IMX25
 	bool
 	select CPU_ARM926T
-	select ARCH_MXC_IOMUX_V3
-	select HAVE_FB_IMX
 	select ARCH_MXC_AUDMUX_V2
+	select ARCH_MXC_IOMUX_V3
 
 config SOC_IMX27
 	bool
diff --git a/trunk/arch/arm/plat-mxc/devices/Kconfig b/trunk/arch/arm/plat-mxc/devices/Kconfig
index 81d7a5456920..dbb2078ee4a1 100644
--- a/trunk/arch/arm/plat-mxc/devices/Kconfig
+++ b/trunk/arch/arm/plat-mxc/devices/Kconfig
@@ -27,6 +27,7 @@ config IMX_HAVE_PLATFORM_IMXDI_RTC
 
 config IMX_HAVE_PLATFORM_IMX_FB
 	bool
+	select HAVE_FB_IMX
 
 config IMX_HAVE_PLATFORM_IMX_I2C
 	bool