diff options
| author | John Lenz <jelenz@edu.rmk.(none)> | 2004-07-13 01:37:33 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2004-07-13 01:37:33 +0100 |
| commit | 77df47551f3edbc9bbae6ea961daad87fda22206 (patch) | |
| tree | 2ba5f3973e26e61ecd428e93a42066110e206727 | |
| parent | 354b4eee2062f5a5f9c8f348db1c0016a398d053 (diff) | |
[ARM PATCH] 1958/1: make collie use INIT_MACHINE
Patch from John Lenz
make collie use the new INIT_MACHINE macro instead of arch_initcall.
| -rw-r--r-- | arch/arm/mach-sa1100/collie.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 73c92caa8089..dcbb3c751c22 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -89,7 +89,7 @@ static struct platform_device *devices[] __initdata = { &locomo_device, }; -static int __init collie_init(void) +static void __init collie_init(void) { int ret = 0; @@ -120,14 +120,9 @@ static int __init collie_init(void) ret = platform_add_devices(devices, ARRAY_SIZE(devices)); if (ret) { printk(KERN_WARNING "collie: Unable to register LoCoMo device\n"); - return ret; } - - return ret; } -arch_initcall(collie_init); - static struct map_desc collie_io_desc[] __initdata = { /* virtual physical length type */ {0xe8000000, 0x00000000, 0x02000000, MT_DEVICE}, /* 32M main flash (cs0) */ @@ -145,4 +140,5 @@ MACHINE_START(COLLIE, "Sharp-Collie") BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) MAPIO(collie_map_io) INITIRQ(sa1100_init_irq) + INIT_MACHINE(collie_init) MACHINE_END |