projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
include
/
asm-i386
/
mpspec.h
diff --git
a/include/asm-i386/mpspec.h
b/include/asm-i386/mpspec.h
index
770bf6d
..
f213493
100644
(file)
--- a/
include/asm-i386/mpspec.h
+++ b/
include/asm-i386/mpspec.h
@@
-23,7
+23,6
@@
extern struct mpc_config_intsrc mp_irqs [MAX_IRQ_SOURCES];
extern int mpc_default_type;
extern unsigned long mp_lapic_addr;
extern int pic_mode;
-extern int using_apic_timer;
#ifdef CONFIG_ACPI
extern void mp_register_lapic (u8 id, u8 enabled);