diff options
Diffstat (limited to 'include/linux/of_device.h')
-rw-r--r-- | include/linux/of_device.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 901b7435e890..9d27475feec1 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h | |||
@@ -4,12 +4,12 @@ | |||
4 | #include <linux/platform_device.h> | 4 | #include <linux/platform_device.h> |
5 | #include <linux/of_platform.h> /* temporary until merge */ | 5 | #include <linux/of_platform.h> /* temporary until merge */ |
6 | 6 | ||
7 | #ifdef CONFIG_OF_DEVICE | ||
8 | #include <linux/of.h> | 7 | #include <linux/of.h> |
9 | #include <linux/mod_devicetable.h> | 8 | #include <linux/mod_devicetable.h> |
10 | 9 | ||
11 | struct device; | 10 | struct device; |
12 | 11 | ||
12 | #ifdef CONFIG_OF | ||
13 | extern const struct of_device_id *of_match_device( | 13 | extern const struct of_device_id *of_match_device( |
14 | const struct of_device_id *matches, const struct device *dev); | 14 | const struct of_device_id *matches, const struct device *dev); |
15 | extern void of_device_make_bus_id(struct device *dev); | 15 | extern void of_device_make_bus_id(struct device *dev); |
@@ -43,7 +43,7 @@ static inline void of_device_node_put(struct device *dev) | |||
43 | of_node_put(dev->of_node); | 43 | of_node_put(dev->of_node); |
44 | } | 44 | } |
45 | 45 | ||
46 | #else /* CONFIG_OF_DEVICE */ | 46 | #else /* CONFIG_OF */ |
47 | 47 | ||
48 | static inline int of_driver_match_device(struct device *dev, | 48 | static inline int of_driver_match_device(struct device *dev, |
49 | struct device_driver *drv) | 49 | struct device_driver *drv) |
@@ -67,6 +67,6 @@ static inline const struct of_device_id *of_match_device( | |||
67 | { | 67 | { |
68 | return NULL; | 68 | return NULL; |
69 | } | 69 | } |
70 | #endif /* CONFIG_OF_DEVICE */ | 70 | #endif /* CONFIG_OF */ |
71 | 71 | ||
72 | #endif /* _LINUX_OF_DEVICE_H */ | 72 | #endif /* _LINUX_OF_DEVICE_H */ |