diff options
| -rw-r--r-- | drivers/mfd/twl-core.c | 1 | ||||
| -rw-r--r-- | 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 4970d43952db..54727ef005d6 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -38,6 +38,7 @@ #include <linux/of.h> #include <linux/of_irq.h> #include <linux/of_platform.h> +#include <linux/irq.h> #include <linux/irqdomain.h> #include <linux/regulator/machine.h> diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h index 242fa3563e2e..b47d2040c9f2 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 */ |