Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux

[linux-2.6] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 9052f4c3493b3f9c3c567fcd4156d6e4127f1c69..4a012d9acbfffb2832bb8d8ddb6e5b919b2dda3b 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -51,6 +51,19 @@ config SPI_MASTER
 comment "SPI Master Controller Drivers"
        depends on SPI_MASTER
 
+config SPI_ATMEL
+       tristate "Atmel SPI Controller"
+       depends on (ARCH_AT91 || AVR32) && SPI_MASTER
+       help
+         This selects a driver for the Atmel SPI Controller, present on
+         many AT32 (AVR32) and AT91 (ARM) chips.
+
+config SPI_BFIN
+       tristate "SPI controller driver for ADI Blackfin5xx"
+       depends on SPI_MASTER && BFIN
+       help
+         This is the SPI controller master driver for Blackfin 5xx processor.
+
 config SPI_BITBANG
        tristate "Bitbanging SPI master"
        depends on SPI_MASTER && EXPERIMENTAL
@@ -150,7 +163,6 @@ config SPI_AT25
 # Add new SPI protocol masters in alphabetical order above this line
 #
 
-
 # (slave support would go here)
 
 endmenu # "SPI support"