2 files changed, 11 insertions, 0 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 9b21c5d77b4a..7a75faeb0526 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -65,6 +65,16 @@ config SPI_BITBANG
           need it.  You only need to select this explicitly to support driver
           modules that aren't part of this kernel tree.
 
+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
 #
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 5da6a4df4012..c2c87e845abf 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_SPI_MASTER)		+= spi.o
 
 # SPI master controller drivers (bus)
 obj-$(CONFIG_SPI_BITBANG)               += spi_bitbang.o
+obj-$(CONFIG_SPI_BUTTERFLY)             += spi_butterfly.o
 #       ... add above this line ...
 
 # SPI protocol drivers (device/link on bus)