From e7cc3aca0f6a36b018934264ee20bee45dc13e29 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Fri, 2 Mar 2012 21:05:31 -0700 Subject: dt: fix twl4030 for non-dt compile on x86 twl4030 still doesn't build correctly for x86 allmodconfig. This fix solves the missing symbol errors. Signed-off-by: Grant Likely Acked-by: Benoit Cousson --- drivers/mfd/twl-core.c | 1 + include/linux/of_platform.h | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index 4970d43952d..54727ef005d 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h index 242fa3563e2..b47d2040c9f 100644 --- a/include/linux/of_platform.h +++ b/include/linux/of_platform.h @@ -94,7 +94,12 @@ extern int of_platform_populate(struct device_node *root, const struct of_device_id *matches, const struct of_dev_auxdata *lookup, struct device *parent); -#else +#endif /* CONFIG_OF_ADDRESS */ + +#endif /* CONFIG_OF_DEVICE */ + +#if !defined(CONFIG_OF_ADDRESS) +struct of_dev_auxdata; static inline int of_platform_populate(struct device_node *root, const struct of_device_id *matches, const struct of_dev_auxdata *lookup, @@ -104,6 +109,4 @@ static inline int of_platform_populate(struct device_node *root, } #endif /* !CONFIG_OF_ADDRESS */ -#endif /* CONFIG_OF_DEVICE */ - #endif /* _LINUX_OF_PLATFORM_H */ -- cgit v1.2.3