VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / arch / arm / mach-ixp4xx / ixdp425-setup.c

diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 160117c..dbcaa46 100644 (file)
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -77,7 +77,7 @@ static struct resource ixdp425_flash_resource = {
        .flags          = IORESOURCE_MEM,
 };
 
-static struct platform_device ixdp425_flash_device = {
+static struct platform_device ixdp425_flash = {
        .name           = "IXP4XX-Flash",
        .id             = 0,
        .dev            = {
@@ -101,10 +101,14 @@ static struct platform_device ixdp425_i2c_controller = {
        .num_resources  = 0
 };
 
+static struct platform_device *ixdp425_devices[] __initdata = {
+       &ixdp425_i2c_controller,
+       &ixdp425_flash
+};
+
 static void __init ixdp425_init(void)
 {
-       platform_add_device(&ixdp425_flash_device);
-       platform_add_device(&ixdp425_i2c_controller);
+       platform_add_devices(&ixdp425_devices, ARRAY_SIZE(ixdp425_devices));
 }
 
 MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
@@ -113,6 +117,7 @@ MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
                IXP4XX_PERIPHERAL_BASE_VIRT)
        MAPIO(ixdp425_map_io)
        INITIRQ(ixp4xx_init_irq)
+       INITTIME(ixp4xx_init_time)
        BOOT_PARAMS(0x0100)
        INIT_MACHINE(ixdp425_init)
 MACHINE_END
@@ -123,6 +128,7 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
                IXP4XX_PERIPHERAL_BASE_VIRT)
        MAPIO(ixdp425_map_io)
        INITIRQ(ixp4xx_init_irq)
+       INITTIME(ixp4xx_init_time)
        BOOT_PARAMS(0x0100)
        INIT_MACHINE(ixdp425_init)
 MACHINE_END
@@ -140,6 +146,7 @@ MACHINE_START(AVILA, "Gateworks Avila Network Platform")
                IXP4XX_PERIPHERAL_BASE_VIRT)
        MAPIO(ixdp425_map_io)
        INITIRQ(ixp4xx_init_irq)
+       INITTIME(ixp4xx_init_time)
        BOOT_PARAMS(0x0100)
        INIT_MACHINE(ixdp425_init)
 MACHINE_END