diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-13 04:48:01 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-13 04:48:01 +0200 |
| commit | e290861f99131fc42d98012a9ea2dc185f08f8f9 (patch) | |
| tree | 5c8b92d095d74d03b281711c81bac54bd59989cd /arch/sh/boards | |
| parent | sh: clean up Migo-R header file (diff) | |
| parent | sh: fix i2c init order on ap325rxa V2 (diff) | |
| download | linux-e290861f99131fc42d98012a9ea2dc185f08f8f9.tar.xz linux-e290861f99131fc42d98012a9ea2dc185f08f8f9.zip | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh/boards')
| -rw-r--r-- | arch/sh/boards/board-ap325rxa.c | 2 | ||||
| -rw-r--r-- | arch/sh/boards/mach-migor/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c index 7ffd1b4315bd..b9c88cc519e2 100644 --- a/arch/sh/boards/board-ap325rxa.c +++ b/arch/sh/boards/board-ap325rxa.c @@ -547,7 +547,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/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index f70f4644deb4..f9b2e4df35b9 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/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) |