git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
mips
/
dec
/
time.c
diff --git
a/arch/mips/dec/time.c
b/arch/mips/dec/time.c
index
74cb055
..
5729474
100644
(file)
--- a/
arch/mips/dec/time.c
+++ b/
arch/mips/dec/time.c
@@
-181,12
+181,12
@@
void __init dec_time_init(void)
}
/* Set up the rate of periodic DS1287 interrupts. */
}
/* Set up the rate of periodic DS1287 interrupts. */
- CMOS_WRITE(RTC_REF_CLCK_32KHZ | (16 -
LOG_2_HZ
), RTC_REG_A);
+ CMOS_WRITE(RTC_REF_CLCK_32KHZ | (16 -
__ffs(HZ)
), RTC_REG_A);
}
EXPORT_SYMBOL(do_settimeofday);
}
EXPORT_SYMBOL(do_settimeofday);
-void __init
dec
_timer_setup(struct irqaction *irq)
+void __init
plat
_timer_setup(struct irqaction *irq)
{
setup_irq(dec_interrupt[DEC_IRQ_RTC], irq);
{
setup_irq(dec_interrupt[DEC_IRQ_RTC], irq);