diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-25 18:40:29 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-25 18:40:29 -0400 |
| commit | e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c (patch) | |
| tree | 31c4d7718111abddfaaa8d3fb14ab4a7e2554cd9 /arch/sh/kernel/cpu/sh4a/setup-sh7343.c | |
| parent | 8b5a10fc6fd02289ea03480f93382b1a99006142 (diff) | |
| parent | c62e43202e7cf50ca24bce58b255df7bf5de69d0 (diff) | |
Merge commit 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/setup-sh7343.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c index 6307e087c86..ac4d5672ec1 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c | |||
| @@ -325,7 +325,7 @@ static int __init sh7343_devices_setup(void) | |||
| 325 | return platform_add_devices(sh7343_devices, | 325 | return platform_add_devices(sh7343_devices, |
| 326 | ARRAY_SIZE(sh7343_devices)); | 326 | ARRAY_SIZE(sh7343_devices)); |
| 327 | } | 327 | } |
| 328 | __initcall(sh7343_devices_setup); | 328 | arch_initcall(sh7343_devices_setup); |
| 329 | 329 | ||
| 330 | static struct platform_device *sh7343_early_devices[] __initdata = { | 330 | static struct platform_device *sh7343_early_devices[] __initdata = { |
| 331 | &cmt_device, | 331 | &cmt_device, |