Skip to content

Commit

Permalink
[ARM] 3985/1: ixp4xx clocksource cleanup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kevin Hilman authored and Russell King committed Dec 7, 2006
1 parent a47d08e commit f9a8ca1
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions arch/arm/mach-ixp4xx/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*************************************************************************/
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -404,5 +408,3 @@ static int __init ixp4xx_clocksource_init(void)

return 0;
}

device_initcall(ixp4xx_clocksource_init);

0 comments on commit f9a8ca1

Please sign in to comment.