summaryrefslogtreecommitdiff
path: root/include/linux/of_device.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-06-10 08:22:17 +0400
committerGrant Likely <grant.likely@secretlab.ca>2010-07-06 02:14:51 +0400
commitf9f5a4669f1334a558f102c311debfd008e7c2bc (patch)
treef07afd4dc4797965ec09f0ed76d429eae5065b87 /include/linux/of_device.h
parent8cec0e7b4c7c0b76f2b5285f250211ad81c3eafd (diff)
downloadlinux-f9f5a4669f1334a558f102c311debfd008e7c2bc.tar.xz
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.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 91d75fb0c726..7d27f5a878f6 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)