Merge remote-tracking branch 'spi/topic/sirf' into spi-next

a3e412dc · Mark Brown · 368ce0bc · 692fb0fe · a3e412dc · a3e412dc
Commit a3e412dc authored Sep 01, 2013 by Mark Brown
Expand all Show whitespace changes
Inline Side-by-side

Showing with 182 additions and 47 deletions

drivers/spi/Kconfig drivers/spi/Kconfig +1 -1

drivers/spi/spi-sirf.c drivers/spi/spi-sirf.c +181 -46

No files found.
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -433,7 +433,7 @@ config SPI_SH_HSPI

 config SPI_SIRF
 	tristate "CSR SiRFprimaII SPI controller"
-	depends on ARCH_SIRF
+	depends on SIRF_DMA
 	select SPI_BITBANG
 	help
 	  SPI driver for CSR SiRFprimaII SoCs

--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c