diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-12-06 14:58:31 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-12-06 14:58:31 +0100 |
| commit | a34fc82e234255b657e62c3ce0c12e9439a59e80 (patch) | |
| tree | a305e3c3c271bb5d6cd7980780f39938a02e32ce /drivers/spi/Makefile | |
| parent | spi/clps711x: New SPI master driver (diff) | |
| parent | spi: omap2-mcspi: remove duplicate inclusion of linux/err.h (diff) | |
| download | linux-a34fc82e234255b657e62c3ce0c12e9439a59e80.tar.xz linux-a34fc82e234255b657e62c3ce0c12e9439a59e80.zip | |
Merge branch 'spi-next' from git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git
Pull in the changes Mark has queued up for SPI
Diffstat (limited to 'drivers/spi/Makefile')
| -rw-r--r-- | drivers/spi/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 25ab4a1cd014..e0fca55cffe6 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -61,10 +61,11 @@ obj-$(CONFIG_SPI_SH_MSIOF) += spi-sh-msiof.o obj-$(CONFIG_SPI_SH_SCI) += spi-sh-sci.o obj-$(CONFIG_SPI_SIRF) += spi-sirf.o obj-$(CONFIG_SPI_STMP3XXX) += spi-stmp.o +obj-$(CONFIG_SPI_TEGRA20_SFLASH) += spi-tegra20-sflash.o +obj-$(CONFIG_SPI_TEGRA20_SLINK) += spi-tegra20-slink.o obj-$(CONFIG_SPI_TI_SSP) += spi-ti-ssp.o obj-$(CONFIG_SPI_TLE62X0) += spi-tle62x0.o obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi-topcliff-pch.o obj-$(CONFIG_SPI_TXX9) += spi-txx9.o obj-$(CONFIG_SPI_XCOMM) += spi-xcomm.o obj-$(CONFIG_SPI_XILINX) += spi-xilinx.o - |