diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 16:29:55 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 16:29:55 -0800 |
commit | 92118c739df879497b8cc5a2eb3a9dc255f01b20 (patch) | |
tree | da556ca2f8afa1b43ca0626c9426f6634c64d32d /drivers/spi/Kconfig | |
parent | b4669d66fb1488fd9cebe0b8da447cfeb86109ba (diff) | |
parent | 276e0c75f1e9a8b34b7b19e8fe188be958d420dd (diff) | |
download | kernel-crypto-92118c739df879497b8cc5a2eb3a9dc255f01b20.tar.gz kernel-crypto-92118c739df879497b8cc5a2eb3a9dc255f01b20.tar.xz kernel-crypto-92118c739df879497b8cc5a2eb3a9dc255f01b20.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/spi/Kconfig')
-rw-r--r-- | drivers/spi/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index b77dbd63e59..7a75faeb052 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -75,16 +75,6 @@ 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 - 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. - # # Add new SPI master controllers in alphabetical order above this line # |