diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-12 22:48:01 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-12 22:48:01 -0400 |
| commit | e290861f99131fc42d98012a9ea2dc185f08f8f9 (patch) | |
| tree | 5c8b92d095d74d03b281711c81bac54bd59989cd /arch/sh/boards | |
| parent | b4a757367d36cebddcd332a4024d92f1e87af370 (diff) | |
| parent | dbefd606a3b3634799b625f4900336e61c89e868 (diff) | |
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 7ffd1b4315b..b9c88cc519e 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) | |||
| 547 | return platform_add_devices(ap325rxa_devices, | 547 | return platform_add_devices(ap325rxa_devices, |
| 548 | ARRAY_SIZE(ap325rxa_devices)); | 548 | ARRAY_SIZE(ap325rxa_devices)); |
| 549 | } | 549 | } |
| 550 | device_initcall(ap325rxa_devices_setup); | 550 | arch_initcall(ap325rxa_devices_setup); |
| 551 | 551 | ||
| 552 | /* Return the board specific boot mode pin configuration */ | 552 | /* Return the board specific boot mode pin configuration */ |
| 553 | static int ap325rxa_mode_pins(void) | 553 | 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 f70f4644deb..f9b2e4df35b 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) | |||
| 608 | 608 | ||
| 609 | return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices)); | 609 | return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices)); |
| 610 | } | 610 | } |
| 611 | __initcall(migor_devices_setup); | 611 | arch_initcall(migor_devices_setup); |
| 612 | 612 | ||
| 613 | /* Return the board specific boot mode pin configuration */ | 613 | /* Return the board specific boot mode pin configuration */ |
| 614 | static int migor_mode_pins(void) | 614 | static int migor_mode_pins(void) |