diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-01 13:49:06 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:49:06 +0100 |
commit | 85cac431329bd09f7d30d489591d7af0d658b008 (patch) | |
tree | 8e81e687c9104c297b9d985e2c5f37f05a6e4b83 /drivers/spi/Makefile | |
parent | 793b3cb6acc081e557dabcf11ce781d64dafb4d4 (diff) | |
parent | b6460366fbadc160604f50047d0394c7fc39ceab (diff) | |
download | blackbird-op-linux-85cac431329bd09f7d30d489591d7af0d658b008.tar.gz blackbird-op-linux-85cac431329bd09f7d30d489591d7af0d658b008.zip |
Merge remote-tracking branch 'spi/topic/qspi' into spi-next
Diffstat (limited to 'drivers/spi/Makefile')
-rw-r--r-- | drivers/spi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 985d7bad7932..ab8d8644af0e 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -49,6 +49,7 @@ obj-$(CONFIG_SPI_OCTEON) += spi-octeon.o obj-$(CONFIG_SPI_OMAP_UWIRE) += spi-omap-uwire.o obj-$(CONFIG_SPI_OMAP_100K) += spi-omap-100k.o obj-$(CONFIG_SPI_OMAP24XX) += spi-omap2-mcspi.o +obj-$(CONFIG_SPI_TI_QSPI) += spi-ti-qspi.o obj-$(CONFIG_SPI_ORION) += spi-orion.o obj-$(CONFIG_SPI_PL022) += spi-pl022.o obj-$(CONFIG_SPI_PPC4xx) += spi-ppc4xx.o |