summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRichard Henderson <rth@kanga.twiddle.home>2004-09-25 00:38:38 -0700
committerRichard Henderson <rth@kanga.twiddle.home>2004-09-25 00:38:38 -0700
commit169a121255e71abb67ee03c3e656bf47b42bac07 (patch)
tree387f0222629dfe6c80e75e3704085ae3f31c973a /include
parent038f9a8f2bb8d02cade66afff652629aba83cf8a (diff)
parent3367bb17b8d5f5df01f0807bb18414e86d4677eb (diff)
Merge kanga.twiddle.home:/home/rth/work/linux/linus-2.6
into kanga.twiddle.home:/home/rth/work/linux/axp-2.6
Diffstat (limited to 'include')
-rw-r--r--include/asm-alpha/bitops.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h
index 4d9c0d81be78..87c43e519748 100644
--- a/include/asm-alpha/bitops.h
+++ b/include/asm-alpha/bitops.h
@@ -2,7 +2,6 @@
#define _ALPHA_BITOPS_H
#include <linux/config.h>
-#include <linux/kernel.h>
#include <asm/compiler.h>
/*