diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-03 12:54:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-03 12:54:51 -0500 |
| commit | e465b535ce5b2318798c68e1454917204494bfe3 (patch) | |
| tree | 7cd7af9813a1fe2bfb04f9edd149e0f152b6cb1d /include/asm-m32r/bitops.h | |
| parent | 7eb19553369c46cc1fa64caf120cbcab1b597f7c (diff) | |
| parent | 5ece5c5192d065c229da01e7b347c1d3877b59fa (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into cpus4096-v2
Diffstat (limited to 'include/asm-m32r/bitops.h')
| -rw-r--r-- | include/asm-m32r/bitops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-m32r/bitops.h b/include/asm-m32r/bitops.h index 6dc9b81bf9f3..aaddf0d57603 100644 --- a/include/asm-m32r/bitops.h +++ b/include/asm-m32r/bitops.h | |||
| @@ -251,6 +251,7 @@ static __inline__ int test_and_change_bit(int nr, volatile void * addr) | |||
| 251 | #include <asm-generic/bitops/ffz.h> | 251 | #include <asm-generic/bitops/ffz.h> |
| 252 | #include <asm-generic/bitops/__ffs.h> | 252 | #include <asm-generic/bitops/__ffs.h> |
| 253 | #include <asm-generic/bitops/fls.h> | 253 | #include <asm-generic/bitops/fls.h> |
| 254 | #include <asm-generic/bitops/__fls.h> | ||
| 254 | #include <asm-generic/bitops/fls64.h> | 255 | #include <asm-generic/bitops/fls64.h> |
| 255 | 256 | ||
| 256 | #ifdef __KERNEL__ | 257 | #ifdef __KERNEL__ |