diff --git a/[refs] b/[refs]
index f010ecb7f879..8939a2f45f50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c6605def534fc6d3d0635dd95f88d3d87d44d9f
+refs/heads/master: 71226a4dbf84e6134be6876b71af04bb5d7353be
diff --git a/trunk/arch/arm/plat-mxc/devices/Kconfig b/trunk/arch/arm/plat-mxc/devices/Kconfig
index 404799487f17..26e745b110a7 100644
--- a/trunk/arch/arm/plat-mxc/devices/Kconfig
+++ b/trunk/arch/arm/plat-mxc/devices/Kconfig
@@ -6,7 +6,7 @@ config IMX_HAVE_PLATFORM_FEC
 	default y if ARCH_MX25 || SOC_IMX27 || ARCH_MX35 || ARCH_MX51
 
 config IMX_HAVE_PLATFORM_FLEXCAN
-	select HAVE_CAN_FLEXCAN
+	select HAVE_CAN_FLEXCAN if CAN
 	bool
 
 config IMX_HAVE_PLATFORM_IMX_I2C