diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /arch/sh/kernel/cpu/sh2a/setup-sh7206.c | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/sh/kernel/cpu/sh2a/setup-sh7206.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c index 3e6f3d7a58be..a9ccc5e8d9e9 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c +++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c | |||
| @@ -338,7 +338,7 @@ static int __init sh7206_devices_setup(void) | |||
| 338 | return platform_add_devices(sh7206_devices, | 338 | return platform_add_devices(sh7206_devices, |
| 339 | ARRAY_SIZE(sh7206_devices)); | 339 | ARRAY_SIZE(sh7206_devices)); |
| 340 | } | 340 | } |
| 341 | __initcall(sh7206_devices_setup); | 341 | arch_initcall(sh7206_devices_setup); |
| 342 | 342 | ||
| 343 | void __init plat_irq_setup(void) | 343 | void __init plat_irq_setup(void) |
| 344 | { | 344 | { |