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 master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[sfrench/cifs-2.6.git]
/
include
/
asm-x86
/
pgtable_32.h
diff --git
a/include/asm-x86/pgtable_32.h
b/include/asm-x86/pgtable_32.h
index acd4b339c49b411b273949c0c70b799696844bd8..ed3e70d8d04bfc3a94a56f38b177850d756cad1a 100644
(file)
--- a/
include/asm-x86/pgtable_32.h
+++ b/
include/asm-x86/pgtable_32.h
@@
-17,10
+17,7
@@
#include <linux/threads.h>
#include <asm/paravirt.h>
-#ifndef _I386_BITOPS_H
-#include <asm/bitops.h>
-#endif
-
+#include <linux/bitops.h>
#include <linux/slab.h>
#include <linux/list.h>
#include <linux/spinlock.h>