diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-16 05:50:10 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-16 05:50:10 -0400 |
| commit | 3e2bcad89814030ad6a369a97ad1481fd35938d3 (patch) | |
| tree | 8d6b9b163dc9ed44ec377ca5b57be1a1fb80f923 /arch/sh/kernel/cpu/sh2a/setup-sh7201.c | |
| parent | dcbf77cac640af0ab944d5cbb07934bf6708b4d9 (diff) | |
| parent | b2add73dbf93fd50f00564d7abc3e2b9aa9dd20c (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/sh/kernel/cpu/sh2a/setup-sh7201.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c index d8febe128066..fbde5b75deb9 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c +++ b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c | |||
| @@ -357,7 +357,7 @@ static int __init sh7201_devices_setup(void) | |||
| 357 | return platform_add_devices(sh7201_devices, | 357 | return platform_add_devices(sh7201_devices, |
| 358 | ARRAY_SIZE(sh7201_devices)); | 358 | ARRAY_SIZE(sh7201_devices)); |
| 359 | } | 359 | } |
| 360 | __initcall(sh7201_devices_setup); | 360 | arch_initcall(sh7201_devices_setup); |
| 361 | 361 | ||
| 362 | void __init plat_irq_setup(void) | 362 | void __init plat_irq_setup(void) |
| 363 | { | 363 | { |