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-m32r/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-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 e78443981349..abea2fdd8689 100644 --- a/include/asm-m32r/bitops.h +++ b/include/asm-m32r/bitops.h | |||
| @@ -465,6 +465,7 @@ static __inline__ unsigned long __ffs(unsigned long word) | |||
| 465 | * fls: find last bit set. | 465 | * fls: find last bit set. |
| 466 | */ | 466 | */ |
| 467 | #define fls(x) generic_fls(x) | 467 | #define fls(x) generic_fls(x) |
| 468 | #define fls64(x) generic_fls64(x) | ||
| 468 | 469 | ||
| 469 | #ifdef __KERNEL__ | 470 | #ifdef __KERNEL__ |
| 470 | 471 | ||