]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[ARM] 3985/1: ixp4xx clocksource cleanup
authorKevin Hilman <khilman@mvista.com>
Tue, 5 Dec 2006 23:45:07 +0000 (00:45 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 7 Dec 2006 16:17:07 +0000 (16:17 +0000)
Rather than using a device_initcall() for the clocksource initialization, just call the init from the sys_timer init function.

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-ixp4xx/common.c

index 1cf3bde1a5d21ce0b76d1b6f3170443f89d53bc0..2ec9a9e9a04dd0e702c58faa8015dd0df5498fac 100644 (file)
@@ -40,6 +40,8 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 
+static int __init ixp4xx_clocksource_init(void);
+
 /*************************************************************************
  * IXP4xx chipset I/O mapping
  *************************************************************************/
@@ -281,6 +283,8 @@ static void __init ixp4xx_timer_init(void)
 
        /* Connect the interrupt handler and enable the interrupt */
        setup_irq(IRQ_IXP4XX_TIMER1, &ixp4xx_timer_irq);
+
+       ixp4xx_clocksource_init();
 }
 
 struct sys_timer ixp4xx_timer = {
@@ -404,5 +408,3 @@ static int __init ixp4xx_clocksource_init(void)
 
        return 0;
 }
-
-device_initcall(ixp4xx_clocksource_init);