Merge remote-tracking branches 'spi/topic/sh', 'spi/topic/sh-msiof' a…

…nd 'spi/topic/topcliff-pch' into spi-next
git-mirror · Aug 4, 2014 · fab6a04 · fab6a04
4 parents 0c18b76 + e9d42d1 + 5dabcf2 + a908210
commit fab6a04
Show file tree

Hide file tree

Showing 5 changed files with 495 additions and 65 deletions.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
@@ -446,7 +446,7 @@ config SPI_SC18IS602
 
 config SPI_SH_MSIOF
 	tristate "SuperH MSIOF SPI controller"
-	depends on HAVE_CLK
+	depends on HAVE_CLK && HAS_DMA
 	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
 	help
 	  SPI driver for SuperH and SH Mobile MSIOF blocks.