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/sh4/setup-sh4-202.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/sh4/setup-sh4-202.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c index 6d088d123591..de4827df19aa 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c | |||
| @@ -138,7 +138,7 @@ static int __init sh4202_devices_setup(void) | |||
| 138 | return platform_add_devices(sh4202_devices, | 138 | return platform_add_devices(sh4202_devices, |
| 139 | ARRAY_SIZE(sh4202_devices)); | 139 | ARRAY_SIZE(sh4202_devices)); |
| 140 | } | 140 | } |
| 141 | __initcall(sh4202_devices_setup); | 141 | arch_initcall(sh4202_devices_setup); |
| 142 | 142 | ||
| 143 | static struct platform_device *sh4202_early_devices[] __initdata = { | 143 | static struct platform_device *sh4202_early_devices[] __initdata = { |
| 144 | &tmu0_device, | 144 | &tmu0_device, |