diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
| commit | a748422ee45725e04e1d3792fa19dfa90ddfd116 (patch) | |
| tree | 978e12895468baaa9f7ab2747b9f7d50beaf1717 /include/asm-i386/apic.h | |
| parent | c63e31c2cc1ec67372920b5e1aff8204d04dd172 (diff) | |
| parent | f4ffaa452e71495a06376f12f772342bc57051fc (diff) | |
| download | kernel-crypto-a748422ee45725e04e1d3792fa19dfa90ddfd116.tar.gz kernel-crypto-a748422ee45725e04e1d3792fa19dfa90ddfd116.tar.xz kernel-crypto-a748422ee45725e04e1d3792fa19dfa90ddfd116.zip | |
Merge branch 'master'
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 ff9ac8d19eb..288233fd77d 100644 --- a/include/asm-i386/apic.h +++ b/include/asm-i386/apic.h @@ -139,6 +139,8 @@ void switch_ipi_to_APIC_timer(void *cpumask); extern int timer_over_8254; +extern int modern_apic(void); + #else /* !CONFIG_X86_LOCAL_APIC */ static inline void lapic_shutdown(void) { } |