diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 10:06:46 +0000 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 10:06:46 +0000 |
commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /include/asm-i386/apic.h | |
parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) |
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h index 8c454aa58ac..a515e2aed82 100644 --- a/include/asm-i386/apic.h +++ b/include/asm-i386/apic.h @@ -118,7 +118,8 @@ extern void release_lapic_nmi(void); extern void disable_timer_nmi_watchdog(void); extern void enable_timer_nmi_watchdog(void); extern void nmi_watchdog_tick (struct pt_regs * regs); -extern int APIC_init_uniprocessor (void); +extern int APIC_init(void); +extern void APIC_late_time_init(void); extern void disable_APIC_timer(void); extern void enable_APIC_timer(void); |