diff --git a/[refs] b/[refs] index f13896a6f5fb..aea9ac517f8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76950e6e54ccfc98a25b501dbb1bc879cce1aa29 +refs/heads/master: e0b2029614fe7e3b09fab253630c5b70eea58f53 diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig index 289127d5241c..7fcd4b4ebcfc 100644 --- a/trunk/arch/sparc/Kconfig +++ b/trunk/arch/sparc/Kconfig @@ -197,7 +197,7 @@ config RWSEM_XCHGADD_ALGORITHM config GENERIC_HWEIGHT bool - default y if !ULTRA_HAS_POPULATION_COUNT + default y config GENERIC_CALIBRATE_DELAY bool