diff --git a/[refs] b/[refs]
index 5fb2f8e3453d..c6bde1bdf00d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00111076f725ec498f5ada19cdd984d111b0e9b3
+refs/heads/master: 9aaa74908b2117bcd560ab3ea8a9d6a491a77c28
diff --git a/trunk/arch/sh/include/asm/device.h b/trunk/arch/sh/include/asm/device.h
index 8688a88303ee..783ecdc64e25 100644
--- a/trunk/arch/sh/include/asm/device.h
+++ b/trunk/arch/sh/include/asm/device.h
@@ -3,7 +3,9 @@
  *
  * This file is released under the GPLv2
  */
-#include <asm-generic/device.h>
+
+struct dev_archdata {
+};
 
 struct platform_device;
 /* allocate contiguous memory chunk and fill in struct resource */
@@ -12,3 +14,6 @@ int platform_resource_setup_memory(struct platform_device *pdev,
 
 void plat_early_device_setup(void);
 
+struct pdev_archdata {
+	int hwblk_id;
+};