patch-2.4.0-test9 linux/include/asm-arm/arch-shark/time.h

Next file: linux/include/asm-arm/arch-shark/vmalloc.h
Previous file: linux/include/asm-arm/arch-shark/system.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test8/linux/include/asm-arm/arch-shark/time.h linux/include/asm-arm/arch-shark/time.h
@@ -43,15 +43,6 @@
 	}
 }
 
-static struct irqaction timerirq = {
-	timer_interrupt,
-	SA_INTERRUPT,
-	0,
-	"timer",
-	NULL,
-	NULL
-};
-
 /*
  * Set up timer interrupt, and return the current time in seconds.
  */
@@ -88,5 +79,7 @@
 	xtime.tv_sec = mktime(r_time.tm_year+epoch, r_time.tm_mon+1, r_time.tm_mday,
 			      r_time.tm_hour, r_time.tm_min, r_time.tm_sec);
 
-	setup_arm_irq(IRQ_TIMER, &timerirq);
+	timer_irq.handler = timer_interrupt;
+	timer_irq.flags = SA_INTERRUPT; /* FIXME: really? */
+	setup_arm_irq(IRQ_TIMER, &timer_irq);
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)