diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-06-09 22:22:17 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-05 16:14:51 -0600 |
| commit | f9f5a4669f1334a558f102c311debfd008e7c2bc (patch) | |
| tree | f07afd4dc4797965ec09f0ed76d429eae5065b87 /include/linux/of_device.h | |
| parent | 8cec0e7b4c7c0b76f2b5285f250211ad81c3eafd (diff) | |
| download | linux-3.10-f9f5a4669f1334a558f102c311debfd008e7c2bc.tar.gz linux-3.10-f9f5a4669f1334a558f102c311debfd008e7c2bc.tar.bz2 linux-3.10-f9f5a4669f1334a558f102c311debfd008e7c2bc.zip | |
of/device: Move struct of_device define outside of CONFIG_OF_DEVICE test
Some code uses of_device even when CONFIG_OF_DEVICE is not set. This
patch makes of_device valid all the time by moving it outside of the
ifdef CONFIG_OF_DEVICE test.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Diffstat (limited to 'include/linux/of_device.h')
| -rw-r--r-- | include/linux/of_device.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 91d75fb0c72..7d27f5a878f 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -1,13 +1,6 @@ #ifndef _LINUX_OF_DEVICE_H #define _LINUX_OF_DEVICE_H -#ifdef CONFIG_OF_DEVICE -#include <linux/device.h> -#include <linux/platform_device.h> -#include <linux/of.h> -#include <linux/mod_devicetable.h> - - /* * The of_device *was* a kind of "base class" that was a superset of * struct device for use by devices attached to an OF node and probed @@ -22,7 +15,12 @@ * from the kernel. */ #define of_device platform_device +#include <linux/platform_device.h> +#ifdef CONFIG_OF_DEVICE +#include <linux/device.h> +#include <linux/of.h> +#include <linux/mod_devicetable.h> #include <asm/of_device.h> #define to_of_device(d) container_of(d, struct of_device, dev) |