diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-12 13:32:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-12 13:32:57 -0300 |
| commit | ea5644051e25a55f6a8a02e5c9d22e06dc318307 (patch) | |
| tree | 32e688148fa7252ab029d2da4e6041ba54545157 /linux/arch/sh | |
| parent | c04ff5d532d9ae99a06936a894a293a3fc806f6a (diff) | |
| download | mediapointer-dvb-s2-ea5644051e25a55f6a8a02e5c9d22e06dc318307.tar.gz mediapointer-dvb-s2-ea5644051e25a55f6a8a02e5c9d22e06dc318307.tar.bz2 | |
backport upstream changes for arch
From: Mauro Carvalho Chehab <mchehab@redhat.com>
It also backports a needed change at vpif_display, applied at -git to fix
compilation against the arm drivers.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/arch/sh')
| -rw-r--r-- | linux/arch/sh/boards/board-ap325rxa.c | 2 | ||||
| -rw-r--r-- | linux/arch/sh/boards/mach-migor/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/arch/sh/boards/board-ap325rxa.c b/linux/arch/sh/boards/board-ap325rxa.c index 96e5bae1c..48ab77ea0 100644 --- a/linux/arch/sh/boards/board-ap325rxa.c +++ b/linux/arch/sh/boards/board-ap325rxa.c @@ -581,7 +581,7 @@ static int __init ap325rxa_devices_setup(void) return platform_add_devices(ap325rxa_devices, ARRAY_SIZE(ap325rxa_devices)); } -device_initcall(ap325rxa_devices_setup); +arch_initcall(ap325rxa_devices_setup); /* Return the board specific boot mode pin configuration */ static int ap325rxa_mode_pins(void) diff --git a/linux/arch/sh/boards/mach-migor/setup.c b/linux/arch/sh/boards/mach-migor/setup.c index f70f4644d..f9b2e4df3 100644 --- a/linux/arch/sh/boards/mach-migor/setup.c +++ b/linux/arch/sh/boards/mach-migor/setup.c @@ -608,7 +608,7 @@ static int __init migor_devices_setup(void) return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices)); } -__initcall(migor_devices_setup); +arch_initcall(migor_devices_setup); /* Return the board specific boot mode pin configuration */ static int migor_mode_pins(void) |