1 files changed, 31 insertions, 7 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index d895a1adb428..9052f4c3493b 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -75,6 +75,13 @@ config SPI_BUTTERFLY
           inexpensive battery powered microcontroller evaluation board.
           This same cable can be used to flash new firmware.
 
+config SPI_IMX
+        tristate "Freescale iMX SPI controller"
+        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
+        help
+          This enables using the Freescale iMX SPI controller in master
+          mode.
+
 config SPI_MPC83xx
         tristate "Freescale MPC83xx SPI controller"
         depends on SPI_MASTER && PPC_83xx && EXPERIMENTAL
@@ -87,6 +94,14 @@ config SPI_MPC83xx
           family of PowerPC processors.  The MPC83xx uses a simple set of shift
           registers for data (opposed to the CPM based descriptor model).
 
+config SPI_OMAP_UWIRE
+        tristate "OMAP1 MicroWire"
+        depends on SPI_MASTER && ARCH_OMAP1
+        select SPI_BITBANG
+        help
+          This hooks up to the MicroWire controller on OMAP1 chips.
+
+
 config SPI_PXA2XX
         tristate "PXA2xx SSP SPI master"
         depends on SPI_MASTER && ARCH_PXA && EXPERIMENTAL
@@ -95,6 +110,12 @@ config SPI_PXA2XX
           The driver can be configured to use any SSP port and additional
           documentation can be found a Documentation/spi/pxa2xx.
 
+config SPI_S3C24XX
+        tristate "Samsung S3C24XX series SPI"
+        depends on SPI_MASTER && ARCH_S3C2410 && EXPERIMENTAL
+        help
+          SPI driver for Samsung S3C24XX series ARM SoCs
+
 config SPI_S3C24XX_GPIO
         tristate "Samsung S3C24XX series SPI by GPIO"
         depends on SPI_MASTER && ARCH_S3C2410 && SPI_BITBANG && EXPERIMENTAL
@@ -107,13 +128,6 @@ config SPI_S3C24XX_GPIO
 # Add new SPI master controllers in alphabetical order above this line
 #
 
-
-config SPI_S3C24XX
-        tristate "Samsung S3C24XX series SPI"
-        depends on SPI_MASTER && ARCH_S3C2410 && EXPERIMENTAL
-        help
-          SPI driver for Samsung S3C24XX series ARM SoCs
-
 #
 # There are lots of SPI device types, with sensors and memory
 # being probably the most widely used ones.
@@ -121,6 +135,16 @@ config SPI_S3C24XX
 comment "SPI Protocol Masters"
         depends on SPI_MASTER
 
+config SPI_AT25
+        tristate "SPI EEPROMs from most vendors"
+        depends on SPI_MASTER && SYSFS
+        help
+          Enable this driver to get read/write support to most SPI EEPROMs,
+          after you configure the board init code to know about each eeprom
+          on your target board.
+
+          This driver can also be built as a module.  If so, the module
+          will be called at25.
 
 #
 # Add new SPI protocol masters in alphabetical order above this line