Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[sfrench/cifs-2.6.git] / arch / parisc / Kconfig

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index d2101237442e8bbfa345788f4b49c950d6848a17..3d73545e8c484d158b96788be65a9a7fcab60f48 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -25,10 +25,23 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
 config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
+config GENERIC_BUG
+       bool
+       default y
+       depends on BUG
+
 config GENERIC_HWEIGHT
        bool
        default y
@@ -37,13 +50,14 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
-config TIME_LOW_RES
+config GENERIC_TIME
        bool
-       depends on SMP
        default y
 
-config GENERIC_ISA_DMA
+config TIME_LOW_RES
        bool
+       depends on SMP
+       default y
 
 config GENERIC_HARDIRQS
        def_bool y