git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
include
/
asm-x86_64
/
irq.h
diff --git
a/include/asm-x86_64/irq.h
b/include/asm-x86_64/irq.h
index
9db5a1b
..
43469d8
100644
(file)
--- a/
include/asm-x86_64/irq.h
+++ b/
include/asm-x86_64/irq.h
@@
-44,9
+44,7
@@
static __inline__ int irq_canonicalize(int irq)
return ((irq == 2) ? 9 : irq);
}
-#ifdef CONFIG_X86_LOCAL_APIC
#define ARCH_HAS_NMI_WATCHDOG /* See include/linux/nmi.h */
-#endif
#ifdef CONFIG_HOTPLUG_CPU
#include <linux/cpumask.h>