Merge branch 'master'

[powerpc.git] / arch / alpha / Kconfig

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 786491f..9bef61b 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -18,9 +18,6 @@ config MMU
        bool
        default y
 
-config UID16
-       bool
-
 config RWSEM_GENERIC_SPINLOCK
        bool
 
@@ -28,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
@@ -40,6 +41,19 @@ config GENERIC_IOMAP
        bool
        default n
 
+config GENERIC_HARDIRQS
+       bool
+       default y
+
+config GENERIC_IRQ_PROBE
+       bool
+       default y
+
+config AUTO_IRQ_AFFINITY
+       bool
+       depends on SMP
+       default y
+
 source "init/Kconfig"
 
 
@@ -437,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