diff --git a/[refs] b/[refs]
index b5aebda7f52d..5bc21db516f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78da107a7ed14fbc6ef77ff4c41d92b11edc9036
+refs/heads/master: 0c929238ca4baefe47f4034732db4c154f2329c6
diff --git a/trunk/arch/sh/include/asm/device.h b/trunk/arch/sh/include/asm/device.h
index a1c9c0daec10..071bcb4d4bfd 100644
--- a/trunk/arch/sh/include/asm/device.h
+++ b/trunk/arch/sh/include/asm/device.h
@@ -3,9 +3,10 @@
  *
  * This file is released under the GPLv2
  */
+#ifndef __ASM_SH_DEVICE_H
+#define __ASM_SH_DEVICE_H
 
-struct dev_archdata {
-};
+#include <asm-generic/device.h>
 
 struct platform_device;
 /* allocate contiguous memory chunk and fill in struct resource */
@@ -14,5 +15,4 @@ int platform_resource_setup_memory(struct platform_device *pdev,
 
 void plat_early_device_setup(void);
 
-struct pdev_archdata {
-};
+#endif /* __ASM_SH_DEVICE_H */
diff --git a/trunk/drivers/video/pvr2fb.c b/trunk/drivers/video/pvr2fb.c
index f9975100d56d..3a3fdc62c75b 100644
--- a/trunk/drivers/video/pvr2fb.c
+++ b/trunk/drivers/video/pvr2fb.c
@@ -1061,7 +1061,7 @@ static struct pvr2_board {
 	int (*init)(void);
 	void (*exit)(void);
 	char name[16];
-} board_driver[] = {
+} board_driver[] __refdata = {
 #ifdef CONFIG_SH_DREAMCAST
 	{ pvr2fb_dc_init, pvr2fb_dc_exit, "Sega DC PVR2" },
 #endif