sched: Remove the cfs_rq dependency from set_task_cpu()

[safe/jmp/linux-2.6] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index c00f9e5..2d9d703 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -155,9 +155,6 @@ config SPI_MPC8xxx
          This enables using the Freescale MPC8xxx SPI controllers in master
          mode.
 
          This enables using the Freescale MPC8xxx SPI controllers in master
          mode.
 

-         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"
        depends on ARCH_OMAP1
 config SPI_OMAP_UWIRE
        tristate "OMAP1 MicroWire"
        depends on ARCH_OMAP1


@@ -172,6 +169,12 @@ config SPI_OMAP24XX
          SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI
          (McSPI) modules.
 
          SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI
          (McSPI) modules.
 

+config SPI_OMAP_100K
+       tristate "OMAP SPI 100K"
+       depends on SPI_MASTER && (ARCH_OMAP850 || ARCH_OMAP730)
+       help
+         OMAP SPI 100K master controller for omap7xx boards.
+

 config SPI_ORION
        tristate "Orion SPI master (EXPERIMENTAL)"
        depends on PLAT_ORION && EXPERIMENTAL
 config SPI_ORION
        tristate "Orion SPI master (EXPERIMENTAL)"
        depends on PLAT_ORION && EXPERIMENTAL


@@ -223,6 +226,13 @@ config SPI_S3C24XX_GPIO
          the inbuilt hardware cannot provide the transfer mode, or
          where the board is using non hardware connected pins.
 
          the inbuilt hardware cannot provide the transfer mode, or
          where the board is using non hardware connected pins.
 

+config SPI_SH_MSIOF
+       tristate "SuperH MSIOF SPI controller"
+       depends on SUPERH && HAVE_CLK
+       select SPI_BITBANG
+       help
+         SPI driver for SuperH MSIOF blocks.
+

 config SPI_SH_SCI
        tristate "SuperH SCI SPI controller"
        depends on SUPERH
 config SPI_SH_SCI
        tristate "SuperH SCI SPI controller"
        depends on SUPERH


@@ -268,6 +278,13 @@ config SPI_XILINX_PLTFM
          This is the platform driver for the SPI controller IP
          from the Xilinx EDK.
 
          This is the platform driver for the SPI controller IP
          from the Xilinx EDK.
 

+config SPI_NUC900
+       tristate "Nuvoton NUC900 series SPI"
+       depends on ARCH_W90X900 && EXPERIMENTAL
+       select SPI_BITBANG
+       help
+         SPI driver for Nuvoton NUC900 series ARM SoCs
+

 #
 # Add new SPI master controllers in alphabetical order above this line
 #
 #
 # Add new SPI master controllers in alphabetical order above this line
 #