From: Kevin Hilman <khilman@mvista.com>
Date: Tue, 5 Dec 2006 23:45:07 +0000 (+0100)
Subject: [ARM] 3985/1: ixp4xx clocksource cleanup
X-Git-Tag: v2.6.20-rc1~34^2~412^2~1^2^3~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f9a8ca1cabf09316d79cab7f04e1390261ff9035;p=linux-2.6-omap-h63xx.git

[ARM] 3985/1: ixp4xx clocksource cleanup

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>
---

diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 1cf3bde1a5d..2ec9a9e9a04 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -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);