x86: Allow x86-32 instruction decoder selftest on x86-64

[pandora-kernel.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 9574947..2c733c2 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -118,7 +118,7 @@ config SPI_GPIO
 
 config SPI_IMX
        tristate "Freescale iMX SPI controller"
-       depends on ARCH_IMX && EXPERIMENTAL
+       depends on ARCH_MX1 && EXPERIMENTAL
        help
          This enables using the Freescale iMX SPI controller in master
          mode.
@@ -139,17 +139,15 @@ config SPI_MPC52xx_PSC
          This enables using the Freescale MPC52xx Programmable Serial
          Controller in master SPI mode.
 
-config SPI_MPC83xx
-       tristate "Freescale MPC83xx/QUICC Engine SPI controller"
-       depends on (PPC_83xx || QUICC_ENGINE) && EXPERIMENTAL
+config SPI_MPC8xxx
+       tristate "Freescale MPC8xxx SPI controller"
+       depends on FSL_SOC
        help
-         This enables using the Freescale MPC83xx and QUICC Engine SPI
-         controllers in master mode.
+         This enables using the Freescale MPC8xxx SPI controllers in master
+         mode.
 
-         Note, this driver uniquely supports the SPI controller on the MPC83xx
-         family of PowerPC processors, plus processors with QUICC Engine
-         technology. This driver uses a simple set of shift registers for data
-         (opposed to the CPM based descriptor model).
+         This driver uses a simple set of shift registers for data (opposed
+         to the CPM based descriptor model).
 
 config SPI_OMAP_UWIRE
        tristate "OMAP1 MicroWire"
@@ -171,6 +169,15 @@ config SPI_ORION
        help
          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
+       default y if MACH_U300
+       help
+         This selects the ARM(R) AMBA(R) PrimeCell PL022 SSP
+         controller. If you have an embedded system with an AMBA(R)
+         bus and a PL022 controller, say Y or M here.
+
 config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"
        depends on ARCH_PXA && EXPERIMENTAL