summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 16:48:51 +0400
committerMark Brown <broonie@linaro.org>2013-09-01 16:48:51 +0400
commitb49247907d3bda31ec90f61d3970be4ed9e45e76 (patch)
treebeac1596c0fbdac56f14201da6bce3940bd11fef /drivers/spi
parent7e718b4bd2ea78702b0f00c668ba99ccfa987181 (diff)
parent788489145be4300cd9a6672723d0d15c6e2cf097 (diff)
downloadlinux-b49247907d3bda31ec90f61d3970be4ed9e45e76.tar.xz
Merge remote-tracking branch 'spi/topic/davinci' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index f3cc865df17b..2f6f42a4f805 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -158,7 +158,7 @@ config SPI_COLDFIRE_QSPI
config SPI_DAVINCI
tristate "Texas Instruments DaVinci/DA8x/OMAP-L/AM1x SoC SPI controller"
- depends on ARCH_DAVINCI
+ depends on ARCH_DAVINCI || ARCH_KEYSTONE
select SPI_BITBANG
select TI_EDMA
help