Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54251
b: refs/heads/master
c: a5f6abd
h: refs/heads/master
i:
  54249: 2487804
  54247: d0accf2
v: v3
  • Loading branch information
Wu, Bryan authored and Linus Torvalds committed May 7, 2007
1 parent a893dd6 commit ed0adcf
Show file tree
Hide file tree
Showing 4 changed files with 1,322 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8cc75c9a1498913d668b6d3559940c6837cee8bf
refs/heads/master: a5f6abd4f7558fea97bc4021fd0eb7dcc5d16a77
7 changes: 6 additions & 1 deletion trunk/drivers/spi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ config SPI_ATMEL
This selects a driver for the Atmel SPI Controller, present on
many AT32 (AVR32) and AT91 (ARM) chips.

config SPI_BFIN
tristate "SPI controller driver for ADI Blackfin5xx"
depends on SPI_MASTER && BFIN
help
This is the SPI controller master driver for Blackfin 5xx processor.

config SPI_BITBANG
tristate "Bitbanging SPI master"
depends on SPI_MASTER && EXPERIMENTAL
Expand Down Expand Up @@ -157,7 +163,6 @@ config SPI_AT25
# Add new SPI protocol masters in alphabetical order above this line
#


# (slave support would go here)

endmenu # "SPI support"
Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/spi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ endif
obj-$(CONFIG_SPI_MASTER) += spi.o

# SPI master controller drivers (bus)
obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o
obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.o
obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
obj-$(CONFIG_SPI_BUTTERFLY) += spi_butterfly.o
obj-$(CONFIG_SPI_IMX) += spi_imx.o
obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
Expand Down
Loading

0 comments on commit ed0adcf

Please sign in to comment.