Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e7cc3aca0f6a36b018934264ee20bee45dc13e29

Authored by Grant Likely
1 parent 280ad7fda5
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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 <grant.likely@secretlab.ca>
Acked-by: Benoit Cousson <b-cousson@ti.com>

Showing 2 changed files with 7 additions and 3 deletions Side-by-side Diff

drivers/mfd/twl-core.c
Diff comments   View file @ e7cc3ac
... ... @@ -38,6 +38,7 @@
38 38 #include <linux/of.h>
39 39 #include <linux/of_irq.h>
40 40 #include <linux/of_platform.h>
  41 +#include <linux/irq.h>
41 42 #include <linux/irqdomain.h>
42 43  
43 44 #include <linux/regulator/machine.h>
include/linux/of_platform.h
Diff comments   View file @ e7cc3ac
... ... @@ -94,7 +94,12 @@
94 94 const struct of_device_id *matches,
95 95 const struct of_dev_auxdata *lookup,
96 96 struct device *parent);
97   -#else
  97 +#endif /* CONFIG_OF_ADDRESS */
  98 +
  99 +#endif /* CONFIG_OF_DEVICE */
  100 +
  101 +#if !defined(CONFIG_OF_ADDRESS)
  102 +struct of_dev_auxdata;
98 103 static inline int of_platform_populate(struct device_node *root,
99 104 const struct of_device_id *matches,
100 105 const struct of_dev_auxdata *lookup,
... ... @@ -103,8 +108,6 @@
103 108 return -ENODEV;
104 109 }
105 110 #endif /* !CONFIG_OF_ADDRESS */
106   -
107   -#endif /* CONFIG_OF_DEVICE */
108 111  
109 112 #endif /* _LINUX_OF_PLATFORM_H */