diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-02 15:20:55 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-02 15:20:55 +1100 |
| commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
| tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /include/asm-i386/apic.h | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
| download | op-kernel-dev-de2d3dbd17e6bb60bde4632ce1c7df063b073934.zip op-kernel-dev-de2d3dbd17e6bb60bde4632ce1c7df063b073934.tar.gz | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-i386/apic.h')
| -rw-r--r-- | include/asm-i386/apic.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h index a515e2a..8c454aa 100644 --- a/include/asm-i386/apic.h +++ b/include/asm-i386/apic.h @@ -118,8 +118,7 @@ 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(void); -extern void APIC_late_time_init(void); +extern int APIC_init_uniprocessor (void); extern void disable_APIC_timer(void); extern void enable_APIC_timer(void); |
