Merge commit 'v2.6.27-rc6' into timers/hpet

[linux-2.6-omap-h63xx.git] / arch / mips / rb532 / time.c

diff --git a/arch/mips/rb532/time.c b/arch/mips/rb532/time.c
index db74edf8cefb8cc96fca57386b93d9096ae3a58f..8e7a46855b50ad8fc5afe81e528d2e301c833a31 100644 (file)
--- a/arch/mips/rb532/time.c
+++ b/arch/mips/rb532/time.c
@@ -49,8 +49,8 @@ static unsigned long __init cal_r4koff(void)
 
 void __init plat_time_init(void)
 {
-       unsigned int est_freq, flags;
-       unsigned long r4k_offset;
+       unsigned int est_freq;
+       unsigned long flags, r4k_offset;
 
        local_irq_save(flags);