diff --git a/[refs] b/[refs]
index 031de9d89914..b15f434add2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77e7bc6194655c36d43707ea53b4f86d1f1c8cf5
+refs/heads/master: 5f35765d836befebdfabf745fdbf2e070c887fac
diff --git a/trunk/drivers/spi/Kconfig b/trunk/drivers/spi/Kconfig
index 879b2a974d64..13bfa9d48082 100644
--- a/trunk/drivers/spi/Kconfig
+++ b/trunk/drivers/spi/Kconfig
@@ -310,8 +310,8 @@ config SPI_S3C24XX_GPIO
 
 config SPI_S3C64XX
 	tristate "Samsung S3C64XX series type SPI"
-	depends on ARCH_S3C64XX && EXPERIMENTAL
-	select S3C64XX_DMA
+	depends on (ARCH_S3C64XX || ARCH_S5P64X0)
+	select S3C64XX_DMA if ARCH_S3C64XX
 	help
 	  SPI driver for Samsung S3C64XX and newer SoCs.