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

git-mirror · Sep 1, 2013 · a3e412d · a3e412d
2 parents 368ce0b + 692fb0f
commit a3e412d
Show file tree

Hide file tree

Showing 2 changed files with 182 additions and 47 deletions.
diff --git 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