diff --git a/[refs] b/[refs]
index d541f956f20c..8b452cc9b141 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77a406da5a5b76445a816d5f043fc9aef4026ff1
+refs/heads/master: e89524d33deb55de28b4ab171e4b0f89d46b2d4e
diff --git a/trunk/drivers/spi/Kconfig b/trunk/drivers/spi/Kconfig
index 91c2f4f3af10..30aea6de4e37 100644
--- a/trunk/drivers/spi/Kconfig
+++ b/trunk/drivers/spi/Kconfig
@@ -147,6 +147,7 @@ config SPI_IMX
 	tristate "Freescale i.MX SPI controllers"
 	depends on ARCH_MXC
 	select SPI_BITBANG
+	default m if IMX_HAVE_PLATFORM_SPI_IMX
 	help
 	  This enables using the Freescale i.MX SPI controllers in master
 	  mode.