ARM: h3600: provide each iPAQ machine type with own init function

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 0b4b8704f9b3a8b9b5aed52da547530afbc9adea..a91abd35b8be3565bbcfb528121cc65c21b07b63 100644 (file)
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -321,6 +321,11 @@ static void __init h3100_map_io(void)
        assign_h3600_egpio = h3100_control_egpio;
 }
 
+static void h3100_mach_init(void)
+{
+       h3xxx_mach_init();
+}
+
 MACHINE_START(H3100, "Compaq iPAQ H3100")
        .phys_io        = 0x80000000,
        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
@@ -328,7 +333,7 @@ MACHINE_START(H3100, "Compaq iPAQ H3100")
        .map_io         = h3100_map_io,
        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
-       .init_machine   = h3xxx_mach_init,
+       .init_machine   = h3100_mach_init,
 MACHINE_END
 
 #endif /* CONFIG_SA1100_H3100 */
@@ -418,6 +423,11 @@ static void __init h3600_map_io(void)
        assign_h3600_egpio = h3600_control_egpio;
 }
 
+static void h3600_mach_init(void)
+{
+       h3xxx_mach_init();
+}
+
 MACHINE_START(H3600, "Compaq iPAQ H3600")
        .phys_io        = 0x80000000,
        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
@@ -425,7 +435,7 @@ MACHINE_START(H3600, "Compaq iPAQ H3600")
        .map_io         = h3600_map_io,
        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
-       .init_machine   = h3xxx_mach_init,
+       .init_machine   = h3600_mach_init,
 MACHINE_END
 
 #endif /* CONFIG_SA1100_H3600 */