diff --git a/[refs] b/[refs]
index 5764d2cacf57..1536a2313c2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00d2952caa6b0b2cd113494ae39f08c4663f371b
+refs/heads/master: d9ddcec35d713dd33dc20dcb4db84db35f9956a6
diff --git a/trunk/drivers/spi/Kconfig b/trunk/drivers/spi/Kconfig
index a1fd73df5416..8ba4510a9519 100644
--- a/trunk/drivers/spi/Kconfig
+++ b/trunk/drivers/spi/Kconfig
@@ -199,7 +199,7 @@ config SPI_FSL_LIB
 	depends on FSL_SOC
 
 config SPI_FSL_SPI
-	tristate "Freescale SPI controller"
+	bool "Freescale SPI controller"
 	depends on FSL_SOC
 	select SPI_FSL_LIB
 	help
@@ -208,7 +208,7 @@ config SPI_FSL_SPI
 	  MPC8569 uses the controller in QE mode, MPC8610 in cpu mode.
 
 config SPI_FSL_ESPI
-	tristate "Freescale eSPI controller"
+	bool "Freescale eSPI controller"
 	depends on FSL_SOC
 	select SPI_FSL_LIB
 	help