diff options
| author | James Morris <jmorris@namei.org> | 2009-08-19 19:18:42 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-19 19:18:42 -0400 |
| commit | ece13879e74313e62109e0755dd3d4f172df89e2 (patch) | |
| tree | 1fe96ab392c1ff203a6fb3f67ed0ed577056572e /arch/sh/kernel/cpu/sh2/setup-sh7619.c | |
| parent | b08dc3eba0c34027010caeda258f495074ae3a54 (diff) | |
| parent | 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f (diff) | |
Merge branch 'master' into next
Conflicts:
security/Kconfig
Manual fix.
Signed-off-by: James Morris <jmorris@namei.org>
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 13798733f2d..8555c05e866 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 | { |