git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
genapic.h
diff --git
a/arch/x86/include/asm/genapic.h
b/arch/x86/include/asm/genapic.h
index d48bee663a6fadb11ff12578ec4dc7cc3112d954..4b8b98fa7f256e54078669a9800d5f79d977acae 100644
(file)
--- a/
arch/x86/include/asm/genapic.h
+++ b/
arch/x86/include/asm/genapic.h
@@
-1,5
+1
@@
-#ifdef CONFIG_X86_32
-# include "genapic_32.h"
-#else
-# include "genapic_64.h"
-#endif
+#include <asm/apic.h>