diff --git a/[refs] b/[refs]
index fcab0c0d1cc2..72e4c543e1f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03e7e170d6fdc5b6f75d1ab2cc1a6cb4f2b6b8c4
+refs/heads/master: 8ebeb545a875b1961ede82800711ab31d2ce5782
diff --git a/trunk/drivers/spi/Kconfig b/trunk/drivers/spi/Kconfig
index a191fa2be7c5..f950b6316949 100644
--- a/trunk/drivers/spi/Kconfig
+++ b/trunk/drivers/spi/Kconfig
@@ -180,10 +180,10 @@ config SPI_OMAP_UWIRE
 	  This hooks up to the MicroWire controller on OMAP1 chips.
 
 config SPI_OMAP24XX
-	tristate "McSPI driver for OMAP24xx/OMAP34xx"
-	depends on ARCH_OMAP2 || ARCH_OMAP3
+	tristate "McSPI driver for OMAP"
+	depends on ARCH_OMAP2PLUS
 	help
-	  SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI
+	  SPI master controller for OMAP24XX and later Multichannel SPI
 	  (McSPI) modules.
 
 config SPI_OMAP_100K