X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fspi%2FKconfig;h=9ce1d01469b19d3c93e61193bd8bce400b9206a8;hb=ccf77cc4af5b048e20cfd9327fcc286cb69c34cc;hp=b77dbd63e596fea9770cde47928dad197ab51e1d;hpb=cf41f8ac386e8d62122e7e394b4c6b3e3ab30ede;p=powerpc.git

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index b77dbd63e5..9ce1d01469 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -75,15 +75,13 @@ config SPI_BUTTERFLY
 	  inexpensive battery powered microcontroller evaluation board.
 	  This same cable can be used to flash new firmware.
 
-config SPI_BUTTERFLY
-	tristate "Parallel port adapter for AVR Butterfly (DEVELOPMENT)"
-	depends on SPI_MASTER && PARPORT && EXPERIMENTAL
-	select SPI_BITBANG
+config SPI_PXA2XX
+	tristate "PXA2xx SSP SPI master"
+	depends on SPI_MASTER && ARCH_PXA && EXPERIMENTAL
 	help
-	  This uses a custom parallel port cable to connect to an AVR
-	  Butterfly <http://www.atmel.com/products/avr/butterfly>, an
-	  inexpensive battery powered microcontroller evaluation board.
-	  This same cable can be used to flash new firmware.
+	  This enables using a PXA2xx SSP port as a SPI master controller.
+	  The driver can be configured to use any SSP port and additional
+	  documentation can be found a Documentation/spi/pxa2xx.
 
 #
 # Add new SPI master controllers in alphabetical order above this line