summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/spinlock.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-06-25 17:57:32 +0200
committerSteve French <sfrench@us.ibm.com>2006-06-25 17:57:32 +0200
commitbbe5d235ee201705530a7153b57e141cd77d818b (patch)
treee98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /include/asm-i386/spinlock.h
parent[CIFS] Enable sec flags on mount for cifs (part one) (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-bbe5d235ee201705530a7153b57e141cd77d818b.tar.xz
linux-bbe5d235ee201705530a7153b57e141cd77d818b.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-i386/spinlock.h')
-rw-r--r--include/asm-i386/spinlock.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-i386/spinlock.h b/include/asm-i386/spinlock.h
index d76b7693cf1d..04ba30234c48 100644
--- a/include/asm-i386/spinlock.h
+++ b/include/asm-i386/spinlock.h
@@ -4,7 +4,6 @@
#include <asm/atomic.h>
#include <asm/rwlock.h>
#include <asm/page.h>
-#include <linux/config.h>
#include <linux/compiler.h>
/*