diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2013-05-07 07:03:42 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2013-05-07 07:03:42 -0400 |
commit | 3132f623386e9ac87077bd839e726f7b940fbc94 (patch) | |
tree | e868da1c9bf286d5375337978eab267cc7a535a8 /include/linux | |
parent | b855f16b05a697ac1863adabe99bfba56e6d3199 (diff) | |
parent | a2b9ea73967386ec5e524ab206bd549d5aafea17 (diff) |
Merge branch 'for-next' of git://sources.calxeda.com/kernel/linux into HEAD
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/of_platform.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h index 3863a4dbdf18..2a93b64a3869 100644 --- a/include/linux/of_platform.h +++ b/include/linux/of_platform.h | |||
@@ -11,9 +11,10 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #ifdef CONFIG_OF_DEVICE | ||
15 | #include <linux/device.h> | 14 | #include <linux/device.h> |
16 | #include <linux/mod_devicetable.h> | 15 | #include <linux/mod_devicetable.h> |
16 | |||
17 | #ifdef CONFIG_OF_DEVICE | ||
17 | #include <linux/pm.h> | 18 | #include <linux/pm.h> |
18 | #include <linux/of_device.h> | 19 | #include <linux/of_device.h> |
19 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
@@ -100,7 +101,7 @@ extern int of_platform_populate(struct device_node *root, | |||
100 | 101 | ||
101 | #if !defined(CONFIG_OF_ADDRESS) | 102 | #if !defined(CONFIG_OF_ADDRESS) |
102 | struct of_dev_auxdata; | 103 | struct of_dev_auxdata; |
103 | struct device; | 104 | struct device_node; |
104 | static inline int of_platform_populate(struct device_node *root, | 105 | static inline int of_platform_populate(struct device_node *root, |
105 | const struct of_device_id *matches, | 106 | const struct of_device_id *matches, |
106 | const struct of_dev_auxdata *lookup, | 107 | const struct of_dev_auxdata *lookup, |