diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 18:29:19 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 18:29:19 +0400 |
| commit | ddc39f90a956b1ce49213e057d32fc94253e20f6 (patch) | |
| tree | 2027362a1fa0632cd7a797add3545431adfe76f5 /arch/alpha/include/asm/bitops.h | |
| parent | 1929cef46fb057377e43a3d594404f1432db4934 (diff) | |
| parent | 84cc1535cb9043ea1921b81cb086138c0f2dc2b9 (diff) | |
| download | linux-ddc39f90a956b1ce49213e057d32fc94253e20f6.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Fix de2104x driver failing to readout MAC address correctly
alpha: Detect Super IO chip, no IDE on Avanti, enable EPP19
alpha: fix pci_mmap_resource API breakage
alpha: fix __arch_hweight32 typo
Diffstat (limited to 'arch/alpha/include/asm/bitops.h')
| -rw-r--r-- | arch/alpha/include/asm/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/bitops.h b/arch/alpha/include/asm/bitops.h index 1dce24bc455a..adfab8a21dfe 100644 --- a/arch/alpha/include/asm/bitops.h +++ b/arch/alpha/include/asm/bitops.h @@ -410,7 +410,7 @@ static inline unsigned long __arch_hweight64(unsigned long w) return __kernel_ctpop(w); } -static inline unsigned int __arch_weight32(unsigned int w) +static inline unsigned int __arch_hweight32(unsigned int w) { return __arch_hweight64(w); } |