| commit | b49247907d3bda31ec90f61d3970be4ed9e45e76 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Sun Sep 01 13:48:51 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Sun Sep 01 13:48:51 2013 +0100 |
| tree | beac1596c0fbdac56f14201da6bce3940bd11fef | |
| parent | 7e718b4bd2ea78702b0f00c668ba99ccfa987181 [diff] | |
| parent | 788489145be4300cd9a6672723d0d15c6e2cf097 [diff] |
Merge remote-tracking branch 'spi/topic/davinci' into spi-next
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index f3cc865..2f6f42a 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig
@@ -158,7 +158,7 @@ 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