diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 10:49:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 10:49:39 -0300 |
| commit | 3d8bb4537fe9a985d386b7a51ee0c1f11d25a095 (patch) | |
| tree | aff679c0dffa6a6365ee183b3a21b8e46c90f689 /linux/arch/sh | |
| parent | 856378592a1b9be61e28092caf5e87446bae4694 (diff) | |
| parent | 0f8f6ec6e6b142a0398c9a0d9925432326d0b595 (diff) | |
| download | mediapointer-dvb-s2-3d8bb4537fe9a985d386b7a51ee0c1f11d25a095.tar.gz mediapointer-dvb-s2-3d8bb4537fe9a985d386b7a51ee0c1f11d25a095.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core
From: Mauro Carvalho Chehab <mchehab@redhat.com>
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) |