From b793b520a9c191bdd9a24362cfa7a627ae4985ca Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@mvista.com>
Date: Wed, 6 Dec 2006 00:45:07 +0100
Subject: [PATCH] --- yaml --- r: 43397 b: refs/heads/master c:
 f9a8ca1cabf09316d79cab7f04e1390261ff9035 h: refs/heads/master i:   43395:
 da59b344277b1af5d0e7decd20c5180a7dc69683 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-ixp4xx/common.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 76a4a7cc27ee..4232e1530f35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a47d08e2e397c434a661c688160f85b60a2392d5
+refs/heads/master: f9a8ca1cabf09316d79cab7f04e1390261ff9035
diff --git a/trunk/arch/arm/mach-ixp4xx/common.c b/trunk/arch/arm/mach-ixp4xx/common.c
index 1cf3bde1a5d2..2ec9a9e9a04d 100644
--- a/trunk/arch/arm/mach-ixp4xx/common.c
+++ b/trunk/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);