Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / parisc / Kconfig

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 0f9ff61..b8ef178 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -37,6 +37,11 @@ config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
+config GENERIC_BUG
+       bool
+       default y
+       depends on BUG
+
 config GENERIC_HWEIGHT
        bool
        default y
@@ -45,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
@@ -261,7 +267,7 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-source "arch/parisc/oprofile/Kconfig"
+source "kernel/Kconfig.instrumentation"
 
 source "arch/parisc/Kconfig.debug"