diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-i386/apic.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/asm-i386/apic.h')
| -rw-r--r-- | include/asm-i386/apic.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h index e1de67483f38..a5810cf7b578 100644 --- a/include/asm-i386/apic.h +++ b/include/asm-i386/apic.h | |||
| @@ -109,7 +109,6 @@ extern int APIC_init_uniprocessor (void); | |||
| 109 | extern void disable_APIC_timer(void); | 109 | extern void disable_APIC_timer(void); |
| 110 | extern void enable_APIC_timer(void); | 110 | extern void enable_APIC_timer(void); |
| 111 | 111 | ||
| 112 | extern int check_nmi_watchdog (void); | ||
| 113 | extern void enable_NMI_through_LVT0 (void * dummy); | 112 | extern void enable_NMI_through_LVT0 (void * dummy); |
| 114 | 113 | ||
| 115 | extern unsigned int nmi_watchdog; | 114 | extern unsigned int nmi_watchdog; |