diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 12:13:52 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 12:13:52 -0300 |
| commit | baf2c601d974ae7d46859426c35fdae28a0e7033 (patch) | |
| tree | d9d70a45831ed7a0dc5c0686fb16e1028bc19c5d /linux/arch/sh/boards | |
| parent | d65762ce274a5e3cfe393763b41e518ec26a5974 (diff) | |
| parent | 4c691e7dabc47811013c7266fa5f32fe96687c36 (diff) | |
| download | mediapointer-dvb-s2-baf2c601d974ae7d46859426c35fdae28a0e7033.tar.gz mediapointer-dvb-s2-baf2c601d974ae7d46859426c35fdae28a0e7033.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/af9015/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/arch/sh/boards')
| -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) |