Merge with mainline to remove plat-omap/Kconfig conflict

Conflicts:
	arch/arm/plat-omap/Kconfig

1 files changed, 22 insertions, 1 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 66c35d74a76b..a191fa2be7c5 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -100,6 +100,23 @@ config SPI_BUTTERFLY
           inexpensive battery powered microcontroller evaluation board.
           This same cable can be used to flash new firmware.
 
+config SPI_COLDFIRE_QSPI
+        tristate "Freescale Coldfire QSPI controller"
+        depends on (M520x || M523x || M5249 || M527x || M528x || M532x)
+        help
+          This enables support for the Coldfire QSPI controller in master
+          mode.
+
+          This driver can also be built as a module.  If so, the module
+          will be called coldfire_qspi.
+
+config SPI_DAVINCI
+        tristate "SPI controller driver for DaVinci/DA8xx SoC's"
+        depends on SPI_MASTER && ARCH_DAVINCI
+        select SPI_BITBANG
+        help
+          SPI master controller for DaVinci and DA8xx SPI modules.
+
 config SPI_GPIO
         tristate "GPIO-based bitbanging SPI Master"
         depends on GENERIC_GPIO
@@ -308,7 +325,7 @@ config SPI_NUC900
 #
 
 config SPI_DESIGNWARE
-        bool "DesignWare SPI controller core support"
+        tristate "DesignWare SPI controller core support"
         depends on SPI_MASTER
         help
           general driver for SPI controller core from DesignWare
@@ -317,6 +334,10 @@ config SPI_DW_PCI
         tristate "PCI interface driver for DW SPI core"
         depends on SPI_DESIGNWARE && PCI
 
+config SPI_DW_MMIO
+        tristate "Memory-mapped io interface driver for DW SPI core"
+        depends on SPI_DESIGNWARE && HAVE_CLK
+
 #
 # There are lots of SPI device types, with sensors and memory
 # being probably the most widely used ones.