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 branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-fixes...
[pandora-kernel.git]
/
arch
/
alpha
/
include
/
asm
/
bitops.h
diff --git
a/arch/alpha/include/asm/bitops.h
b/arch/alpha/include/asm/bitops.h
index
adfab8a
..
85b8152
100644
(file)
--- a/
arch/alpha/include/asm/bitops.h
+++ b/
arch/alpha/include/asm/bitops.h
@@
-454,13
+454,11
@@
sched_find_first_bit(const unsigned long b[2])
return __ffs(tmp) + ofs;
}
return __ffs(tmp) + ofs;
}
-#include <asm-generic/bitops/
ext2-non-atomic
.h>
+#include <asm-generic/bitops/
le
.h>
#define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a)
#define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)
#define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a)
#define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)
-#include <asm-generic/bitops/minix.h>
-
#endif /* __KERNEL__ */
#endif /* _ALPHA_BITOPS_H */
#endif /* __KERNEL__ */
#endif /* _ALPHA_BITOPS_H */