aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kerr <jeremy.kerr@canonical.com>2010-02-14 07:13:43 -0700
committerGrant Likely <grant.likely@secretlab.ca>2010-02-14 07:13:43 -0700
commit9dfbf207802c7e8cda9d081a8d750b50633c82d2 (patch)
tree618b86e4d33263272d70159d33d3b25f24921d79
parent7c540d9e3da38c3d1c15fb8059e4577a84ac0066 (diff)
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>
-rw-r--r--include/linux/of.h3
1 files changed, 3 insertions, 0 deletions
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 */