diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /arch/sh/kernel/cpu/sh4a/setup-sh7780.c | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/setup-sh7780.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c index 715e05b431e5..2c901f446959 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c | |||
| @@ -256,7 +256,7 @@ static int __init sh7780_devices_setup(void) | |||
| 256 | return platform_add_devices(sh7780_devices, | 256 | return platform_add_devices(sh7780_devices, |
| 257 | ARRAY_SIZE(sh7780_devices)); | 257 | ARRAY_SIZE(sh7780_devices)); |
| 258 | } | 258 | } |
| 259 | __initcall(sh7780_devices_setup); | 259 | arch_initcall(sh7780_devices_setup); |
| 260 | 260 | ||
| 261 | static struct platform_device *sh7780_early_devices[] __initdata = { | 261 | static struct platform_device *sh7780_early_devices[] __initdata = { |
| 262 | &tmu0_device, | 262 | &tmu0_device, |