diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
| commit | 054d5c9238f3c577ad51195c3ee7803613f322cc (patch) | |
| tree | ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /arch/mips/include/asm/bitops.h | |
| parent | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (diff) | |
| parent | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/mips/include/asm/bitops.h')
| -rw-r--r-- | arch/mips/include/asm/bitops.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/include/asm/bitops.h b/arch/mips/include/asm/bitops.h index 9255cfbee459..b0ce7ca2851f 100644 --- a/arch/mips/include/asm/bitops.h +++ b/arch/mips/include/asm/bitops.h | |||
| @@ -700,7 +700,10 @@ static inline int ffs(int word) | |||
| 700 | #ifdef __KERNEL__ | 700 | #ifdef __KERNEL__ |
| 701 | 701 | ||
| 702 | #include <asm-generic/bitops/sched.h> | 702 | #include <asm-generic/bitops/sched.h> |
| 703 | #include <asm-generic/bitops/hweight.h> | 703 | |
| 704 | #include <asm/arch_hweight.h> | ||
| 705 | #include <asm-generic/bitops/const_hweight.h> | ||
| 706 | |||
| 704 | #include <asm-generic/bitops/ext2-non-atomic.h> | 707 | #include <asm-generic/bitops/ext2-non-atomic.h> |
| 705 | #include <asm-generic/bitops/ext2-atomic.h> | 708 | #include <asm-generic/bitops/ext2-atomic.h> |
| 706 | #include <asm-generic/bitops/minix.h> | 709 | #include <asm-generic/bitops/minix.h> |