diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-03-23 15:50:51 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-03-23 15:50:51 +0100 |
| commit | b4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7 (patch) | |
| tree | 030ef62361042d1a034087ad9a726db3b57bba72 /include/asm-i386/apic.h | |
| parent | NTFS: Fix two compiler warnings on Alpha. Thanks to Andrew Morton for (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff) | |
| download | linux-b4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7.tar.xz linux-b4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7.zip | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/asm-i386/apic.h')
| -rw-r--r-- | include/asm-i386/apic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h index d30b8571573f..ff9ac8d19eb2 100644 --- a/include/asm-i386/apic.h +++ b/include/asm-i386/apic.h @@ -137,6 +137,8 @@ void switch_APIC_timer_to_ipi(void *cpumask); void switch_ipi_to_APIC_timer(void *cpumask); #define ARCH_APICTIMER_STOPS_ON_C3 1 +extern int timer_over_8254; + #else /* !CONFIG_X86_LOCAL_APIC */ static inline void lapic_shutdown(void) { } |