diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /include/asm-x86_64/bitops.h | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-x86_64/bitops.h')
| -rw-r--r-- | include/asm-x86_64/bitops.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86_64/bitops.h b/include/asm-x86_64/bitops.h index f7ba57b1cc08..5b535eaf5309 100644 --- a/include/asm-x86_64/bitops.h +++ b/include/asm-x86_64/bitops.h | |||
| @@ -399,6 +399,8 @@ static __inline__ int fls(int x) | |||
| 399 | return r+1; | 399 | return r+1; |
| 400 | } | 400 | } |
| 401 | 401 | ||
| 402 | #define ARCH_HAS_FAST_MULTIPLIER 1 | ||
| 403 | |||
| 402 | #include <asm-generic/bitops/hweight.h> | 404 | #include <asm-generic/bitops/hweight.h> |
| 403 | 405 | ||
| 404 | #endif /* __KERNEL__ */ | 406 | #endif /* __KERNEL__ */ |