diff --git a/[refs] b/[refs]
index 7f6539dda5fb..f33960d37029 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6b42eb6a66c188642aeb447312938c6f6ebee86
+refs/heads/master: 7c304d7e24fd4996a2b219312f739c4406b8e2e3
diff --git a/trunk/drivers/memory/Makefile b/trunk/drivers/memory/Makefile
index cd8486b51f74..9cce5d70ed52 100644
--- a/trunk/drivers/memory/Makefile
+++ b/trunk/drivers/memory/Makefile
@@ -2,7 +2,9 @@
 # Makefile for memory devices
 #
 
+ifeq ($(CONFIG_DDR),y)
 obj-$(CONFIG_OF)		+= of_memory.o
+endif
 obj-$(CONFIG_TI_EMIF)		+= emif.o
 obj-$(CONFIG_TEGRA20_MC)	+= tegra20-mc.o
 obj-$(CONFIG_TEGRA30_MC)	+= tegra30-mc.o
diff --git a/trunk/drivers/memory/of_memory.h b/trunk/drivers/memory/of_memory.h
index 20b496efed65..ef2514f553d3 100644
--- a/trunk/drivers/memory/of_memory.h
+++ b/trunk/drivers/memory/of_memory.h
@@ -12,7 +12,7 @@
 #ifndef __LINUX_MEMORY_OF_REG_H
 #define __LINUX_MEMORY_OF_REG_H
 
-#ifdef CONFIG_OF
+#if defined(CONFIG_OF) && defined(CONFIG_DDR)
 extern const struct lpddr2_min_tck *of_get_min_tck(struct device_node *np,
 		struct device *dev);
 extern const struct lpddr2_timings
@@ -31,6 +31,6 @@ static inline const struct lpddr2_timings
 {
 	return NULL;
 }
-#endif /* CONFIG_OF */
+#endif /* CONFIG_OF && CONFIG_DDR */
 
 #endif /* __LINUX_MEMORY_OF_REG_ */