diff options
| author | James Morris <jmorris@namei.org> | 2009-08-20 09:18:42 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-20 09:18:42 +1000 |
| commit | ece13879e74313e62109e0755dd3d4f172df89e2 (patch) | |
| tree | 1fe96ab392c1ff203a6fb3f67ed0ed577056572e /arch/sh/kernel/cpu/sh2a/setup-sh7201.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/sh2a/setup-sh7201.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c index d8febe12806..fbde5b75deb 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c +++ b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c @@ -357,7 +357,7 @@ static int __init sh7201_devices_setup(void) return platform_add_devices(sh7201_devices, ARRAY_SIZE(sh7201_devices)); } -__initcall(sh7201_devices_setup); +arch_initcall(sh7201_devices_setup); void __init plat_irq_setup(void) { |