summaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 09:59:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 09:59:57 -0700
commitfefd26b3b8597a11a422d950c0d4424ff33a70ad (patch)
tree6794a36072635e71e5b33aec47c616bafdca65c1 /include/asm-x86_64
parent4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff)
parent038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh: Remove all inclusions of <linux/config.h> Manually resolved trivial path conflicts due to removed files in the sound/oss/ subdirectory.
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r--include/asm-x86_64/alternative-asm.i2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86_64/alternative-asm.i b/include/asm-x86_64/alternative-asm.i
index e4041f4fa4d..0b3f1a2bb2c 100644
--- a/include/asm-x86_64/alternative-asm.i
+++ b/include/asm-x86_64/alternative-asm.i
@@ -1,5 +1,3 @@
-#include <linux/config.h>
-
#ifdef CONFIG_SMP
.macro LOCK_PREFIX
1: lock