diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-21 13:28:24 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-21 13:28:24 +0200 |
commit | 470fba7ebe60ad9185056b080b331abad24b4df9 (patch) | |
tree | f83bc13d97adaf5dd0e0f1d6a157b890f868577f /arch/mips/rb532/time.c | |
parent | 7225e75144b9718cbbe1820d9c011c809d5773fd (diff) | |
parent | 6a55617ed5d1aa62b850de2cf66f5ede2eef4825 (diff) | |
download | op-kernel-dev-470fba7ebe60ad9185056b080b331abad24b4df9.zip op-kernel-dev-470fba7ebe60ad9185056b080b331abad24b4df9.tar.gz |
Merge branch 'linus' into x86/doc
Diffstat (limited to 'arch/mips/rb532/time.c')
-rw-r--r-- | arch/mips/rb532/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/rb532/time.c b/arch/mips/rb532/time.c index db74edf..8e7a468 100644 --- 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); |