diff options
| author |   Rob Herring <rob.herring@calxeda.com> | 2013-04-19 17:32:52 -0500 |
|---|---|---|
| committer |   Grant Likely <grant.likely@linaro.org> | 2013-06-12 12:37:40 +0100 |
| commit | ba166e900b502b74b9425881caa94f94891b0a1f (patch) | |
| tree | 6576c70c8a97bb21876320fc264c7ed8d9e7238d /include/linux/of_device.h | |
| parent | usb: chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE (diff) | |
| download | linux-dev-ba166e900b502b74b9425881caa94f94891b0a1f.tar.xz linux-dev-ba166e900b502b74b9425881caa94f94891b0a1f.zip | |
of: remove CONFIG_OF_DEVICE
CONFIG_OF_DEVICE is always selected when CONFIG_OF is enabled, so remove
it and simplify of_platform.h and of_device.h headers. This also fixes
!OF compiles using of_platform_populate.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
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 @@ #include <linux/platform_device.h> #include <linux/of_platform.h> /* temporary until merge */ -#ifdef CONFIG_OF_DEVICE #include <linux/of.h> #include <linux/mod_devicetable.h> struct device; +#ifdef CONFIG_OF extern const struct of_device_id *of_match_device( const struct of_device_id *matches, const struct device *dev); extern void of_device_make_bus_id(struct device *dev); @@ -43,7 +43,7 @@ static inline void of_device_node_put(struct device *dev) of_node_put(dev->of_node); } -#else /* CONFIG_OF_DEVICE */ +#else /* CONFIG_OF */ static inline int of_driver_match_device(struct device *dev, struct device_driver *drv) @@ -67,6 +67,6 @@ static inline const struct of_device_id *of_match_device( { return NULL; } -#endif /* CONFIG_OF_DEVICE */ +#endif /* CONFIG_OF */ #endif /* _LINUX_OF_DEVICE_H */ |