diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-13 13:57:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-13 13:57:53 -0400 |
| commit | 7334219c44826ae0ebe6f07555c6b97f978ce266 (patch) | |
| tree | fd60c521724f2ccffdd40aa453a89ad017b75068 /arch/sh/kernel/cpu/sh2/setup-sh7619.c | |
| parent | e694958388c50148389b0e9b9e9e8945cf0f1b98 (diff) | |
| parent | dbefd606a3b3634799b625f4900336e61c89e868 (diff) | |
Merge branch 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: fix i2c init order on ap325rxa V2
sh: fix i2c init order on Migo-R V2
sh: convert processor device setup functions to arch_initcall()
Diffstat (limited to 'arch/sh/kernel/cpu/sh2/setup-sh7619.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh2/setup-sh7619.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c index 13798733f2db..8555c05e8667 100644 --- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c +++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c | |||
| @@ -187,7 +187,7 @@ static int __init sh7619_devices_setup(void) | |||
| 187 | return platform_add_devices(sh7619_devices, | 187 | return platform_add_devices(sh7619_devices, |
| 188 | ARRAY_SIZE(sh7619_devices)); | 188 | ARRAY_SIZE(sh7619_devices)); |
| 189 | } | 189 | } |
| 190 | __initcall(sh7619_devices_setup); | 190 | arch_initcall(sh7619_devices_setup); |
| 191 | 191 | ||
| 192 | void __init plat_irq_setup(void) | 192 | void __init plat_irq_setup(void) |
| 193 | { | 193 | { |