diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-08-25 10:04:27 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-08-25 10:04:32 +0200 |
commit | daedc71836e5a398fd0cc0e12c5cb43539478485 (patch) | |
tree | c56567a92017679e57195cef992d4a5561c20e0e /arch/sh/boards/board-ap325rxa.c | |
parent | irq: Remove superfluous NULL pointer check in check_irq_resend() (diff) | |
parent | Linux 2.6.31-rc7 (diff) | |
download | linux-daedc71836e5a398fd0cc0e12c5cb43539478485.tar.xz linux-daedc71836e5a398fd0cc0e12c5cb43539478485.zip |
Merge commit 'v2.6.31-rc7' into irq/core
Merge reason: move from an -rc2 base to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/boards/board-ap325rxa.c')
-rw-r--r-- | arch/sh/boards/board-ap325rxa.c | 2 |
1 files changed, 1 insertions, 1 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) |