Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43397
b: refs/heads/master
c: f9a8ca1
h: refs/heads/master
i:
  43395: da59b34
v: v3
  • Loading branch information
Kevin Hilman authored and Russell King committed Dec 7, 2006
1 parent 00400f8 commit b793b52
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a47d08e2e397c434a661c688160f85b60a2392d5
refs/heads/master: f9a8ca1cabf09316d79cab7f04e1390261ff9035
6 changes: 4 additions & 2 deletions trunk/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 b793b52

Please sign in to comment.