Date:2011-06-25 23:26:29 (12 years 9 months ago)
Author:Stefan Schmidt
Commit:42c875a44e2f9995dc7e7d1c814d37ceeb4046c1
Message:Merge remote-tracking branch 'origin/ben-wpan-atben' into ben-wpan-stefan

Conflicts:
drivers/spi/Kconfig
drivers/spi/Makefile

diff --cc drivers/spi/Kconfig
index 76cab80,bfd2abe..eca2ec0
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -382,10 -382,13 +382,17 @@@ config SPI_NUC90
help
SPI driver for Nuvoton NUC900 series ARM SoCs

+config SPI_ATUSB
+ tristate "Ben WPAN USB transceiver driver"
+ depends on USB && SPI
+
+ config SPI_ATBEN
+ tristate "ATBEN 8:10 SPI interface"
+ depends on JZ4740_QI_LB60 && EXPERIMENTAL
+ help
+ Bit-banging SPI driver for the 8:10 interface of the Ben NanoNote
+ when equipped with an ATBEN board.
+
#
# Add new SPI master controllers in alphabetical order above this line
#
diff --cc drivers/spi/Makefile
index 872bef9,9bf0a9c..1ca0967
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@ -50,7 -50,7 +50,8 @@@ obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci
obj-$(CONFIG_SPI_SH_MSIOF) += spi_sh_msiof.o
obj-$(CONFIG_SPI_STMP3XXX) += spi_stmp.o
obj-$(CONFIG_SPI_NUC900) += spi_nuc900.o
+obj-$(CONFIG_SPI_ATUSB) += atusb.o
+ obj-$(CONFIG_SPI_ATBEN) += spi_atben.o

# special build for s3c24xx spi driver with fiq support
spi_s3c24xx_hw-y := spi_s3c24xx.o


interactive