Merge omap-drivers

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

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 7e54e48efd5cb6af7c9451811871f303bef7c854..8c646579f6881f849cb45dedfcbf8082459f4118 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -131,6 +131,20 @@ config SPI_S3C24XX_GPIO
          GPIO lines to provide the SPI bus. This can be used where
          the inbuilt hardware cannot provide the transfer mode, or
          where the board is using non hardware connected pins.
+
+config SPI_OMAP_UWIRE
+       tristate "OMAP MicroWire"
+       depends on SPI_MASTER && ARCH_OMAP
+       select SPI_BITBANG
+       help
+         This hooks up to the MicroWire controller on OMAP chips.
+
+config SPI_OMAP24XX
+       bool "McSPI driver for OMAP24xx"
+       depends on SPI_MASTER && ARCH_OMAP24XX
+       help
+         SPI master controller for OMAP24xx McSPI modules.
+
 #
 # Add new SPI master controllers in alphabetical order above this line
 #
@@ -142,6 +156,13 @@ config SPI_S3C24XX_GPIO
 comment "SPI Protocol Masters"
        depends on SPI_MASTER
 
+config TSC2102
+       depends on SPI_MASTER
+       tristate "TSC2102 codec support"
+       ---help---
+         Say Y here if you want support for the TSC2102 chip.  It
+         will be needed for the touchscreen driver on some boards.
+
 config SPI_AT25
        tristate "SPI EEPROMs from most vendors"
        depends on SPI_MASTER && SYSFS