From 561f69b2f07db37c57662ed7d590d40ee1712430 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 18 Jan 2012 21:51:54 +1000 Subject: [PATCH] --- yaml --- r: 287847 b: refs/heads/master c: 66dae316dd2941cad098e6674810fdc3f4b2e275 h: refs/heads/master i: 287845: 18d80dc7bbef909b124f3d911801533e657a4f26 287843: 4a202685112581f7b23873446ce669e917c895da 287839: 4cb0085a2b00f5a62ee344c8d64ab6c286085cac v: v3 --- [refs] | 2 +- trunk/arch/sh/include/asm/device.h | 8 ++++---- trunk/drivers/video/pvr2fb.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a6170459c0b7..5ee4a7b1b197 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 833218f16b1fbfdff0dbb9ac477cf0c6e85cd4f5 +refs/heads/master: 66dae316dd2941cad098e6674810fdc3f4b2e275 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 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