git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
arch
/
m32r
/
include
/
asm
/
bitops.h
diff --git
a/arch/m32r/include/asm/bitops.h
b/arch/m32r/include/asm/bitops.h
index
aaddf0d
..
6300f22
100644
(file)
--- a/
arch/m32r/include/asm/bitops.h
+++ b/
arch/m32r/include/asm/bitops.h
@@
-266,9
+266,8
@@
static __inline__ int test_and_change_bit(int nr, volatile void * addr)
#ifdef __KERNEL__
-#include <asm-generic/bitops/
ext2-non-atomic
.h>
+#include <asm-generic/bitops/
le
.h>
#include <asm-generic/bitops/ext2-atomic.h>
-#include <asm-generic/bitops/minix.h>
#endif /* __KERNEL__ */