X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fparisc%2FKconfig;h=2b649c46631c14fb07d408dd3bad2e0869a8dae6;hb=09552ccd8277e6382097e93a40f7311a09449367;hp=3d73545e8c484d158b96788be65a9a7fcab60f48;hpb=db7ce76f6b3dfc119ab2f03e5e7784afc9cf2f05;p=linux-2.6-omap-h63xx.git

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 3d73545e8c4..2b649c46631 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -19,6 +19,11 @@ config MMU
 config STACK_GROWSUP
 	def_bool y
 
+config GENERIC_LOCKBREAK
+	bool
+	default y
+	depends on SMP && PREEMPT
+
 config RWSEM_GENERIC_SPINLOCK
 	def_bool y
 
@@ -267,7 +272,7 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-source "arch/parisc/oprofile/Kconfig"
+source "kernel/Kconfig.instrumentation"
 
 source "arch/parisc/Kconfig.debug"