diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/asm-i386/mpspec.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/asm-i386/mpspec.h')
| -rw-r--r-- | include/asm-i386/mpspec.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-i386/mpspec.h b/include/asm-i386/mpspec.h index 64a0b8e6afeb..62113d3bfdc2 100644 --- a/include/asm-i386/mpspec.h +++ b/include/asm-i386/mpspec.h | |||
| @@ -22,7 +22,6 @@ extern int mp_bus_id_to_type [MAX_MP_BUSSES]; | |||
| 22 | extern int mp_irq_entries; | 22 | extern int mp_irq_entries; |
| 23 | extern struct mpc_config_intsrc mp_irqs [MAX_IRQ_SOURCES]; | 23 | extern struct mpc_config_intsrc mp_irqs [MAX_IRQ_SOURCES]; |
| 24 | extern int mpc_default_type; | 24 | extern int mpc_default_type; |
| 25 | extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES]; | ||
| 26 | extern unsigned long mp_lapic_addr; | 25 | extern unsigned long mp_lapic_addr; |
| 27 | extern int pic_mode; | 26 | extern int pic_mode; |
| 28 | extern int using_apic_timer; | 27 | extern int using_apic_timer; |