diff --git a/[refs] b/[refs]
index afeae5891718..2e525b1df262 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bfe9b5c3a684fe39eb58a65e466c103d1c32c9a
+refs/heads/master: efb2e014fc4f2675011b802e1a84bf9a58756004
diff --git a/trunk/include/linux/of_device.h b/trunk/include/linux/of_device.h
index d3a74e00a3e1..e7904a9cd3a3 100644
--- a/trunk/include/linux/of_device.h
+++ b/trunk/include/linux/of_device.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_OF_DEVICE_H
 #define _LINUX_OF_DEVICE_H
 
+#ifdef CONFIG_OF_DEVICE
 #include <linux/device.h>
 #include <linux/of.h>
 #include <linux/mod_devicetable.h>
@@ -26,5 +27,6 @@ static inline void of_device_free(struct of_device *dev)
 
 extern ssize_t of_device_get_modalias(struct of_device *ofdev,
 					char *str, ssize_t len);
+#endif /* CONFIG_OF_DEVICE */
 
 #endif /* _LINUX_OF_DEVICE_H */
diff --git a/trunk/include/linux/of_platform.h b/trunk/include/linux/of_platform.h
index 908406651330..ac3ae0758fbe 100644
--- a/trunk/include/linux/of_platform.h
+++ b/trunk/include/linux/of_platform.h
@@ -11,6 +11,7 @@
  *
  */
 
+#ifdef CONFIG_OF_DEVICE
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/mod_devicetable.h>
@@ -66,5 +67,6 @@ static inline void of_unregister_platform_driver(struct of_platform_driver *drv)
 extern struct of_device *of_find_device_by_node(struct device_node *np);
 
 extern int of_bus_type_init(struct bus_type *bus, const char *name);
+#endif /* CONFIG_OF_DEVICE */
 
 #endif	/* _LINUX_OF_PLATFORM_H */