diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:27:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:27:41 -0500 |
| commit | d347da0deffa1d8f88f0d270eab040e4707c9916 (patch) | |
| tree | e0911f2ef4d36a7b44f7a5379feabebbd37dcfc4 /include/asm-generic/bitops.h | |
| parent | c6c88bbde4d8b2ffe9886b7130b2e23781d424e5 (diff) | |
| parent | 74cb8798222bb7d1aecb0acb91e6eeedf5feb948 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/asm-generic/bitops.h')
| -rw-r--r-- | include/asm-generic/bitops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/bitops.h b/include/asm-generic/bitops.h index ce31b739fd80..0e6d9852008c 100644 --- a/include/asm-generic/bitops.h +++ b/include/asm-generic/bitops.h | |||
| @@ -56,6 +56,7 @@ extern __inline__ int test_bit(int nr, const unsigned long * addr) | |||
| 56 | */ | 56 | */ |
| 57 | 57 | ||
| 58 | #define fls(x) generic_fls(x) | 58 | #define fls(x) generic_fls(x) |
| 59 | #define fls64(x) generic_fls64(x) | ||
| 59 | 60 | ||
| 60 | #ifdef __KERNEL__ | 61 | #ifdef __KERNEL__ |
| 61 | 62 | ||