Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d02bf062 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 

* 'spi/next' of git://git.secretlab.ca/git/linux-2.6:
  spi/spi_bfin_sport: new driver for a SPI bus via the Blackfin SPORT peripheral
  spi/tle620x: add missing device_remove_file()
parents 04830fcc 9c3e7375

drivers/spi/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -80,6 +80,15 @@ config SPI_BFIN 
	help

	  This is the SPI controller master driver for Blackfin 5xx processor.



config SPI_BFIN_SPORT

	tristate "SPI bus via Blackfin SPORT"

	depends on BLACKFIN

	help

	  Enable support for a SPI bus via the Blackfin SPORT peripheral.



	  This driver can also be built as a module.  If so, the module

	  will be called spi_bfin_sport.



config SPI_AU1550

	tristate "Au1550/Au12x0 SPI Controller"

	depends on (SOC_AU1550 || SOC_AU1200) && EXPERIMENTAL

drivers/spi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ obj-$(CONFIG_SPI_ALTERA) += spi_altera.o 
obj-$(CONFIG_SPI_ATMEL)			+= atmel_spi.o

obj-$(CONFIG_SPI_ATH79)			+= ath79_spi.o

obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.o

obj-$(CONFIG_SPI_BFIN_SPORT)		+= spi_bfin_sport.o

obj-$(CONFIG_SPI_BITBANG)		+= spi_bitbang.o

obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o

obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o

drivers/spi/spi_bfin_sport.c

0 → 100644
+952 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/spi/tle62x0.c

+2 −1

File changed.

Preview size limit exceeded, changes collapsed.