diff --git a/[refs] b/[refs]
index fa83ba807f3c..1c36ef272444 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c540d9e3da38c3d1c15fb8059e4577a84ac0066
+refs/heads/master: 9dfbf207802c7e8cda9d081a8d750b50633c82d2
diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h
index 5c7b6a64acd9..48b0ee6d0f76 100644
--- a/trunk/include/linux/of.h
+++ b/trunk/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 */