diff --git a/[refs] b/[refs]
index 7a2a7a2c4ef2..1a1d421e4fba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cec0e7b4c7c0b76f2b5285f250211ad81c3eafd
+refs/heads/master: f9f5a4669f1334a558f102c311debfd008e7c2bc
diff --git a/trunk/include/linux/of_device.h b/trunk/include/linux/of_device.h
index 91d75fb0c726..7d27f5a878f6 100644
--- a/trunk/include/linux/of_device.h
+++ b/trunk/include/linux/of_device.h
@@ -1,13 +1,6 @@
 #ifndef _LINUX_OF_DEVICE_H
 #define _LINUX_OF_DEVICE_H
 
-#ifdef CONFIG_OF_DEVICE
-#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>
 
+#ifdef CONFIG_OF_DEVICE
+#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)