From: Jeremy Kerr <jeremy.kerr@canonical.com>
Date: Sun, 14 Feb 2010 14:13:43 +0000 (-0700)
Subject: of: protect linux/of.h with CONFIG_OF
X-Git-Tag: v2.6.34-rc1~289^2~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9dfbf207802c7e8cda9d081a8d750b50633c82d2;p=~emulex%2Finfiniband.git

of: protect linux/of.h with CONFIG_OF

For platforms that have CONFIG_OF optional, we need to make the contents
of linux/of.h conditional on CONFIG_OF.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Michal Simek <monstr@monstr.eu>
---

diff --git a/include/linux/of.h b/include/linux/of.h
index 5c7b6a64acd..48b0ee6d0f7 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -22,6 +22,8 @@
 
 #include <asm/byteorder.h>
 
+#ifdef CONFIG_OF
+
 typedef u32 phandle;
 typedef u32 ihandle;
 
@@ -194,4 +196,5 @@ extern void of_attach_node(struct device_node *);
 extern void of_detach_node(struct device_node *);
 #endif
 
+#endif /* CONFIG_OF */
 #endif /* _LINUX_OF_H */