diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:49:12 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:49:12 -0400 |
| commit | a3e412dcf568cc389a584cd37ccb0057a89dcb0a (patch) | |
| tree | 279b97d2e178721c2d0b0d6663631e9f9ccc69b8 /drivers/spi/Kconfig | |
| parent | 368ce0bca434347b7cd5550ee71b046d7727830f (diff) | |
| parent | 692fb0fe5aacea861e4006342029cf505a7dbe18 (diff) | |
Merge remote-tracking branch 'spi/topic/sirf' into spi-next
Diffstat (limited to 'drivers/spi/Kconfig')
| -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 f552c89abdd4..0170d4c4a8a3 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
| @@ -433,7 +433,7 @@ config SPI_SH_HSPI | |||
| 433 | 433 | ||
| 434 | config SPI_SIRF | 434 | config SPI_SIRF |
| 435 | tristate "CSR SiRFprimaII SPI controller" | 435 | tristate "CSR SiRFprimaII SPI controller" |
| 436 | depends on ARCH_SIRF | 436 | depends on SIRF_DMA |
| 437 | select SPI_BITBANG | 437 | select SPI_BITBANG |
| 438 | help | 438 | help |
| 439 | SPI driver for CSR SiRFprimaII SoCs | 439 | SPI driver for CSR SiRFprimaII SoCs |