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 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
bitops.h
diff --git
a/arch/ia64/include/asm/bitops.h
b/arch/ia64/include/asm/bitops.h
index
336984a
..
b76f7e0
100644
(file)
--- a/
arch/ia64/include/asm/bitops.h
+++ b/
arch/ia64/include/asm/bitops.h
@@
-461,7
+461,6
@@
static __inline__ unsigned long __arch_hweight64(unsigned long x)
#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>
#include <asm-generic/bitops/sched.h>
#endif /* __KERNEL__ */