diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 21:47:24 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 21:47:24 (GMT) |
commit | a4e884a311893b476893739901bed382cd62b4fe (patch) | |
tree | 7b7b52678b61dfdf8e3a16b0e920d1e9b0cae979 /arch/arm/mach-footbridge/dc21285-timer.c | |
parent | ce1dc02f76432a46db149241e015a4f782974623 (diff) | |
parent | cc56449f53ba45646c6f0a2edf77c4acb342caed (diff) | |
download | linux-fsl-qoriq-a4e884a311893b476893739901bed382cd62b4fe.tar.xz |
Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git - ARM changes
First ever true git merge. Let's see if it actually works.
Diffstat (limited to 'arch/arm/mach-footbridge/dc21285-timer.c')
-rw-r--r-- | arch/arm/mach-footbridge/dc21285-timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c index 580e1d4..da5b9b7 100644 --- a/arch/arm/mach-footbridge/dc21285-timer.c +++ b/arch/arm/mach-footbridge/dc21285-timer.c @@ -51,8 +51,6 @@ static struct irqaction footbridge_timer_irq = { */ static void __init footbridge_timer_init(void) { - isa_rtc_init(); - timer1_latch = (mem_fclk_21285 + 8 * HZ) / (16 * HZ); *CSR_TIMER1_CLR = 0; @@ -60,6 +58,8 @@ static void __init footbridge_timer_init(void) *CSR_TIMER1_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_AUTORELOAD | TIMER_CNTL_DIV16; setup_irq(IRQ_TIMER1, &footbridge_timer_irq); + + isa_rtc_init(); } struct sys_timer footbridge_timer = { |