This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / arm / mach-ixp2000 / ixdp2400.c

diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c
index cd98116..39ef558 100644 (file)
--- a/arch/arm/mach-ixp2000/ixdp2400.c
+++ b/arch/arm/mach-ixp2000/ixdp2400.c
@@ -23,6 +23,9 @@
 #include <linux/device.h>
 #include <linux/bitops.h>
 #include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <linux/mm.h>
+#include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -45,7 +48,7 @@
 /*************************************************************************
  * IXDP2400 timer tick
  *************************************************************************/
-static void __init ixdp2400_timer_init(void)
+static void __init ixdp2400_init_time(void)
 {
        int numerator, denominator;
        int denom_array[] = {2, 4, 8, 16, 1, 2, 4, 8};
@@ -56,11 +59,6 @@ static void __init ixdp2400_timer_init(void)
        ixp2000_init_time(((3125000 * numerator) / (denominator)) / 2);
 }
 
-static struct timer ixdp2400_timer = {
-       .init           = ixdp2400_timer_init,
-       .offset         = ixp2000_gettimeoffset,
-};
-
 /*************************************************************************
  * IXDP2400 PCI
  *************************************************************************/
@@ -173,7 +171,7 @@ MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform")
        BOOT_PARAMS(0x00000100)
        MAPIO(ixdp2x00_map_io)
        INITIRQ(ixdp2400_init_irq)
-       .timer          = &ixdp2400_timer,
+       INITTIME(ixdp2400_init_time)
        INIT_MACHINE(ixdp2x00_init_machine)
 MACHINE_END