patch-2.1.96 linux/arch/arm/kernel/time.c

Next file: linux/arch/arm/kernel/traps.c
Previous file: linux/arch/arm/kernel/setup.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.95/linux/arch/arm/kernel/time.c linux/arch/arm/kernel/time.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/smp.h>
+#include <linux/init.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -30,7 +31,6 @@
 #include <asm/delay.h>
 
 #include <linux/timex.h>
-#include <asm/irq-no.h>
 #include <asm/hardware.h>
 
 extern int setup_arm_irq(int, struct irqaction *);
@@ -143,12 +143,12 @@
 	update_rtc ();
 }
 
-static struct irqaction irqtimer0 = { timer_interrupt, 0, 0, "timer", NULL, NULL};
+static struct irqaction irqtimer = { timer_interrupt, 0, 0, "timer", NULL, NULL};
 
-void time_init(void)
+__initfunc(void time_init(void))
 {
 	xtime.tv_sec = setup_timer();
 	xtime.tv_usec = 0;
 
-	setup_arm_irq(IRQ_TIMER0, &irqtimer0);
+	setup_arm_irq(IRQ_TIMER, &irqtimer);
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov