diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-30 02:10:27 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 19:10:49 +0200 |
commit | 25c1a411e8a0a709abe3449866125dc290711ea8 (patch) | |
tree | b9392dbf99afd1d72380e464d1a221eb20fd8566 /arch/x86/include/asm/timer.h | |
parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mch... (diff) | |
download | linux-25c1a411e8a0a709abe3449866125dc290711ea8.tar.xz linux-25c1a411e8a0a709abe3449866125dc290711ea8.zip |
x86: fix mismerge in arch/x86/include/asm/timer.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/include/asm/timer.h')
-rw-r--r-- | arch/x86/include/asm/timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h index a81195eaa2b3..bd37ed444a21 100644 --- a/arch/x86/include/asm/timer.h +++ b/arch/x86/include/asm/timer.h @@ -12,9 +12,9 @@ unsigned long native_calibrate_tsc(void); #ifdef CONFIG_X86_32 extern int timer_ack; -extern int recalibrate_cpu_khz(void); extern irqreturn_t timer_interrupt(int irq, void *dev_id); #endif /* CONFIG_X86_32 */ +extern int recalibrate_cpu_khz(void); extern int no_timer_check; |