aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:49:06 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:49:06 +0100
commit85cac431329bd09f7d30d489591d7af0d658b008 (patch)
tree8e81e687c9104c297b9d985e2c5f37f05a6e4b83 /drivers/spi/Makefile
parentMerge remote-tracking branch 'spi/topic/pxa' into spi-next (diff)
parentspi/qspi: fix missing unlock on error in ti_qspi_start_transfer_one() (diff)
downloadlinux-dev-85cac431329bd09f7d30d489591d7af0d658b008.tar.xz
linux-dev-85cac431329bd09f7d30d489591d7af0d658b008.zip
Merge remote-tracking branch 'spi/topic/qspi' into spi-next
Diffstat (limited to 'drivers/spi/Makefile')
-rw-r--r--drivers/spi/Makefile1
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