diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:48:51 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:48:51 -0400 |
| commit | b49247907d3bda31ec90f61d3970be4ed9e45e76 (patch) | |
| tree | beac1596c0fbdac56f14201da6bce3940bd11fef | |
| parent | 7e718b4bd2ea78702b0f00c668ba99ccfa987181 (diff) | |
| parent | 788489145be4300cd9a6672723d0d15c6e2cf097 (diff) | |
Merge remote-tracking branch 'spi/topic/davinci' into spi-next
| -rw-r--r-- | drivers/spi/Kconfig | 2 |
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 | |||
| 158 | 158 | ||
| 159 | config SPI_DAVINCI | 159 | config SPI_DAVINCI |
| 160 | tristate "Texas Instruments DaVinci/DA8x/OMAP-L/AM1x SoC SPI controller" | 160 | tristate "Texas Instruments DaVinci/DA8x/OMAP-L/AM1x SoC SPI controller" |
| 161 | depends on ARCH_DAVINCI | 161 | depends on ARCH_DAVINCI || ARCH_KEYSTONE |
| 162 | select SPI_BITBANG | 162 | select SPI_BITBANG |
| 163 | select TI_EDMA | 163 | select TI_EDMA |
| 164 | help | 164 | help |