diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-24 11:56:51 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-24 11:56:51 -0500 |
commit | 0e69e084017f015555ae584972386296c8c1bf1c (patch) | |
tree | 93dd53668b4f7bb78cd7a58c3620f44ef32dc8c6 /drivers/video | |
parent | 371528caec553785c37f73fa3926ea0de84f986f (diff) | |
parent | 1ae911cba414f7e805b2cb3798fa402b36a21601 (diff) |
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
SuperH fixes for 3.3-rc5
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
sh: Fix sh2a build error for CONFIG_CACHE_WRITETHROUGH
sh: modify a resource of sh_eth_giga1_resources in board-sh7757lcr
arch/sh: remove references to cpu_*_map.
sh: Fix typo in pci-sh7780.c
sh: add platform_device for SPI1 in setup-sh7757
sh: modify resource for SPI0 in setup-sh7757
sh: se7724: fix compile breakage
sh: clkfwk: bugfix: use clk_reparent() for div6 clocks
sh: clock-sh7724: fixup sh_fsi clock settings
sh: sh7757lcr: update to the new MMCIF DMA configuration
sh: fix the sh_mmcif_plat_data in board-sh7757lcr
video: pvr2fb: Fix up spurious section mismatch warnings.
sh: Defer to asm-generic/device.h.
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/pvr2fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c index f9975100d56d..3a3fdc62c75b 100644 --- a/drivers/video/pvr2fb.c +++ b/drivers/video/pvr2fb.c | |||
@@ -1061,7 +1061,7 @@ static struct pvr2_board { | |||
1061 | int (*init)(void); | 1061 | int (*init)(void); |
1062 | void (*exit)(void); | 1062 | void (*exit)(void); |
1063 | char name[16]; | 1063 | char name[16]; |
1064 | } board_driver[] = { | 1064 | } board_driver[] __refdata = { |
1065 | #ifdef CONFIG_SH_DREAMCAST | 1065 | #ifdef CONFIG_SH_DREAMCAST |
1066 | { pvr2fb_dc_init, pvr2fb_dc_exit, "Sega DC PVR2" }, | 1066 | { pvr2fb_dc_init, pvr2fb_dc_exit, "Sega DC PVR2" }, |
1067 | #endif | 1067 | #endif |