[PATCH] of/device: Move struct of_device define outside ofCONFIG_OF_DEVICE test

From: Grant Likely
Date: Thu Jun 10 2010 - 00:54:19 EST

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@xxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

Hi Randy,

Here's what I applied to my tree to fix the niu driver compile warning.
I've compile tested it on several architectures, and am pushing it out
to my linux-next branch now.


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 c877d54..8cd1fe7 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -1,13 +1,6 @@

-#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>

+#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)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/