X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fparisc%2FKconfig;h=b8ef1787a191ce81337590391067b9dda811b89d;hb=8854cb49a249c8df883874e64dfbc25eaa69a6ee;hp=0f9ff618c6d7205c7d86f856cd78b9898b89e85a;hpb=a57bf8a4f23cca2b5be5446649bbe22d1440af5d;p=linux-2.6

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 0f9ff618c6..b8ef1787a1 100644
--- 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"