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

git-mirror · Oct 25, 2013 · ad14ad7 · ad14ad7
2 parents b3d6c80 + cb52c67
commit ad14ad7
Show file tree

Hide file tree

Showing 3 changed files with 234 additions and 40 deletions.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
@@ -370,7 +370,7 @@ config SPI_PXA2XX_PCI
 
 config SPI_RSPI
 	tristate "Renesas RSPI controller"
-	depends on SUPERH && SH_DMAE_BASE
+	depends on (SUPERH || ARCH_SHMOBILE) && SH_DMAE_BASE
 	help
 	  SPI driver for Renesas RSPI blocks.