diff options
| author | Kevin Hilman <khilman@mvista.com> | 2006-12-06 00:45:07 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-12-07 17:17:07 +0100 |
| commit | f9a8ca1cabf09316d79cab7f04e1390261ff9035 (patch) | |
| tree | 1a02fcc75b4fb645dc5221750c0573ed02b0c5c6 /arch | |
| parent | [ARM] 3984/1: ixp4xx/nslu2: Fix disk LED numbering (take 2) (diff) | |
| download | linux-f9a8ca1cabf09316d79cab7f04e1390261ff9035.tar.xz linux-f9a8ca1cabf09316d79cab7f04e1390261ff9035.zip | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 1cf3bde1a5d2..2ec9a9e9a04d 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); |