diff --git a/[refs] b/[refs]
index 338b49c2443b..bc3cb4d3a866 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c73fcc846c91f53fd2c67fd9c6c04888a9e5892e
+refs/heads/master: e865f3e6f4ef2d2617f5003c7c819ed15b5a511b
diff --git a/trunk/include/asm-sparc/device.h b/trunk/include/asm-sparc/device.h
index d8f9872b0e2d..4a56d84d69c4 100644
--- a/trunk/include/asm-sparc/device.h
+++ b/trunk/include/asm-sparc/device.h
@@ -3,5 +3,17 @@
  *
  * This file is released under the GPLv2
  */
-#include <asm-generic/device.h>
+#ifndef _ASM_SPARC_DEVICE_H
+#define _ASM_SPARC_DEVICE_H
+
+struct device_node;
+struct of_device;
+
+struct dev_archdata {
+	struct device_node	*prom_node;
+	struct of_device	*op;
+};
+
+#endif /* _ASM_SPARC_DEVICE_H */
+