Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

[linux-2.6-omap-h63xx.git] / arch / alpha / Kconfig

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index eedf41bf7057567b182ab221c64908da1685c98d..9bef61b303674e3be48a0fbb403ee7d85c126e30 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -25,6 +25,10 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
+config GENERIC_FIND_NEXT_BIT
+       bool
+       default y
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -447,6 +451,10 @@ config ALPHA_IRONGATE
        depends on ALPHA_NAUTILUS
        default y
 
+config GENERIC_HWEIGHT
+       bool
+       default y if !ALPHA_EV6 && !ALPHA_EV67
+
 config ALPHA_AVANTI
        bool
        depends on ALPHA_XL || ALPHA_AVANTI_CH