This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c
index af894f4..a6e30d0 100644 (file)
--- a/arch/arm/mach-ixp2000/enp2611.c
+++ b/arch/arm/mach-ixp2000/enp2611.c
@@ -26,6 +26,9 @@
 #include <linux/interrupt.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>
@@ -52,16 +55,11 @@
 /*************************************************************************
  * ENP-2611 timer tick configuration
  *************************************************************************/
-static void __init enp2611_timer_init(void)
+static void __init enp2611_init_time(void)
 {
        ixp2000_init_time(50 * 1000 * 1000);
 }
 
-static struct enp2611_timer = {
-       .init           = enp2611_timer_init,
-       .offset         = ixp2000_gettimeoffset,
-};
-
 
 /*************************************************************************
  * ENP-2611 PCI
@@ -204,7 +202,7 @@ MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")
        BOOT_PARAMS(0x00000100)
        MAPIO(ixp2000_map_io)
        INITIRQ(ixp2000_init_irq)
-       .timer          = &enp2611_timer,
+       INITTIME(enp2611_init_time)
        INIT_MACHINE(enp2611_init_machine)
 MACHINE_END
 #endif