[SCSI] iscsi class: regression - fix races with state manipulation and blocking/unblo...

[linux-2.6-omap-h63xx.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index b91571122daadfd3c0f7ae6115f5c7bfe62784e2..d8107890db152c789a764248a9d9a1078484ee02 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -61,7 +61,7 @@ config SPI_ATMEL
 
 config SPI_BFIN
        tristate "SPI controller driver for ADI Blackfin5xx"
-       depends on SPI_MASTER && BFIN
+       depends on SPI_MASTER && BLACKFIN
        help
          This is the SPI controller master driver for Blackfin 5xx processor.
 
@@ -124,16 +124,17 @@ config SPI_MPC52xx_PSC
          Controller in master SPI mode.
 
 config SPI_MPC83xx
-       tristate "Freescale MPC83xx SPI controller"
-       depends on SPI_MASTER && PPC_83xx && EXPERIMENTAL
+       tristate "Freescale MPC83xx/QUICC Engine SPI controller"
+       depends on SPI_MASTER && (PPC_83xx || QUICC_ENGINE) && EXPERIMENTAL
        select SPI_BITBANG
        help
-         This enables using the Freescale MPC83xx SPI controller in master
-         mode.
+         This enables using the Freescale MPC83xx and QUICC Engine SPI
+         controllers in master mode.
 
          Note, this driver uniquely supports the SPI controller on the MPC83xx
-         family of PowerPC processors.  The MPC83xx uses a simple set of shift
-         registers for data (opposed to the CPM based descriptor model).
+         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).
 
 config SPI_OMAP_UWIRE
        tristate "OMAP1 MicroWire"
@@ -143,15 +144,16 @@ config SPI_OMAP_UWIRE
          This hooks up to the MicroWire controller on OMAP1 chips.
 
 config SPI_OMAP24XX
-       tristate "McSPI driver for OMAP24xx"
-       depends on SPI_MASTER && ARCH_OMAP24XX
+       tristate "McSPI driver for OMAP24xx/OMAP34xx"
+       depends on SPI_MASTER && (ARCH_OMAP24XX || ARCH_OMAP34XX)
        help
-         SPI master controller for OMAP24xx Multichannel SPI
+         SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI
          (McSPI) modules.
 
 config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"
        depends on SPI_MASTER && ARCH_PXA && EXPERIMENTAL
+       select PXA_SSP
        help
          This enables using a PXA2xx SSP port as a SPI master controller.
          The driver can be configured to use any SSP port and additional
@@ -174,6 +176,13 @@ config SPI_S3C24XX_GPIO
          the inbuilt hardware cannot provide the transfer mode, or
          where the board is using non hardware connected pins.
 
+config SPI_SH_SCI
+       tristate "SuperH SCI SPI controller"
+       depends on SPI_MASTER && SUPERH
+       select SPI_BITBANG
+       help
+         SPI driver for SuperH SCI blocks.
+
 config SPI_TXX9
        tristate "Toshiba TXx9 SPI controller"
        depends on SPI_MASTER && GENERIC_GPIO && CPU_TX49XX