summaryrefslogtreecommitdiff
path: root/drivers/memory/of_memory.h
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-09-05 22:29:23 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-05 22:57:19 +0400
commit7c304d7e24fd4996a2b219312f739c4406b8e2e3 (patch)
tree6f513d00e0bda25b934baf0e3ee36b83ecaa2d04 /drivers/memory/of_memory.h
parente6b42eb6a66c188642aeb447312938c6f6ebee86 (diff)
downloadlinux-7c304d7e24fd4996a2b219312f739c4406b8e2e3.tar.xz
memory: fix build when CONFIG_OF && !CONFIG_DDR
Commit e6b42eb "memory: emif: add device tree support to emif driver" added drivers/memory/of_memory.c, which references tables defined in lib/jedec_ddr_data.c. of_memory.c is compiled when CONFIG_OF, whereas jedec_ddr_data.c is compiled when CONFIG_DDR. This breaks the build when CONFIG_OF is defined but not CONFIG_DDR: drivers/built-in.o: In function `of_get_ddr_timings': drivers/memory/of_memory.c:138: undefined reference to `lpddr2_jedec_timings' drivers/built-in.o: In function `of_get_min_tck': drivers/memory/of_memory.c:62: undefined reference to `lpddr2_jedec_min_tck' make: *** [vmlinux] Error 1 To solve this, only compile of_memory.c when CONFIG_OF && CONFIG_DDR, otherwise, stub out the functions. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/memory/of_memory.h')
-rw-r--r--drivers/memory/of_memory.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memory/of_memory.h b/drivers/memory/of_memory.h
index 20b496efed65..ef2514f553d3 100644
--- a/drivers/memory/of_memory.h
+++ b/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_ */