diff --git a/[refs] b/[refs]
index 1532ec63511c..8f74b7f108df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2878bda864c53db599c4a3e3b136ed3e2af68ca0
+refs/heads/master: 18e9a971c7fb17dab079305a23af5bb57b0706b1
diff --git a/trunk/drivers/memory/Kconfig b/trunk/drivers/memory/Kconfig
index b08327cca0e5..e0b3156d65b5 100644
--- a/trunk/drivers/memory/Kconfig
+++ b/trunk/drivers/memory/Kconfig
@@ -9,6 +9,7 @@ if MEMORY
 
 config TI_EMIF
 	tristate "Texas Instruments EMIF driver"
+	depends on ARCH_OMAP2PLUS
 	select DDR
 	help
 	  This driver is for the EMIF module available in Texas Instruments