diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 00:00:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 00:00:02 -0400 |
| commit | 4b6b987969b076298485697bfb0d0e35502642a3 (patch) | |
| tree | a8f5ebd6a0b9efbe30272012d759669b0c5ddc13 /arch/sh/boards/board-ap325rxa.c | |
| parent | df47cd096c8f54a5242e3a2ffb4525c804567eda (diff) | |
| parent | 60e0a4c7adc700f2d2929cdb2d0055e519a3eb3d (diff) | |
Merge branch 'master' into sh/hwblk
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 07a54740d43e..19eea4ab1ccc 100644 --- a/arch/sh/boards/board-ap325rxa.c +++ b/arch/sh/boards/board-ap325rxa.c | |||
| @@ -553,7 +553,7 @@ static int __init ap325rxa_devices_setup(void) | |||
| 553 | return platform_add_devices(ap325rxa_devices, | 553 | return platform_add_devices(ap325rxa_devices, |
| 554 | ARRAY_SIZE(ap325rxa_devices)); | 554 | ARRAY_SIZE(ap325rxa_devices)); |
| 555 | } | 555 | } |
| 556 | device_initcall(ap325rxa_devices_setup); | 556 | arch_initcall(ap325rxa_devices_setup); |
| 557 | 557 | ||
| 558 | /* Return the board specific boot mode pin configuration */ | 558 | /* Return the board specific boot mode pin configuration */ |
| 559 | static int ap325rxa_mode_pins(void) | 559 | static int ap325rxa_mode_pins(void) |