Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index fc14b8dea0d71daf1a72f0f17dd5228b07c7ba33..de35c3ad8a69a00e2e3f677d43864a16bfdba14b 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -80,6 +80,15 @@ config SPI_BFIN
        help
          This is the SPI controller master driver for Blackfin 5xx processor.
 
+config SPI_BFIN_SPORT
+       tristate "SPI bus via Blackfin SPORT"
+       depends on BLACKFIN
+       help
+         Enable support for a SPI bus via the Blackfin SPORT peripheral.
+
+         This driver can also be built as a module.  If so, the module
+         will be called spi_bfin_sport.
+
 config SPI_AU1550
        tristate "Au1550/Au12x0 SPI Controller"
        depends on (SOC_AU1550 || SOC_AU1200) && EXPERIMENTAL
@@ -271,8 +280,8 @@ config SPI_ORION
          This enables using the SPI master controller on the Orion chips.
 
 config SPI_PL022
-       tristate "ARM AMBA PL022 SSP controller (EXPERIMENTAL)"
-       depends on ARM_AMBA && EXPERIMENTAL
+       tristate "ARM AMBA PL022 SSP controller"
+       depends on ARM_AMBA
        default y if MACH_U300
        default y if ARCH_REALVIEW
        default y if INTEGRATOR_IMPD1