summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-11-01 17:02:56 +0100
committerIngo Molnar <mingo@elte.hu>2009-11-01 17:02:56 +0100
commit529978e9439958947ef557b512064bee0f98b2e1 (patch)
treec5becbc7f60a65221d5c7373392d23f3c9b44fb5 /lib
parenta009e6f937bee73aa32012647b9b3878069430b7 (diff)
parentb6727b12dd2ffb4a890eb5b13a298230c29ba45d (diff)
Merge branch 'linus' into auto-latest
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig.debug2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 30df5865ecbe..234ceb10861f 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -392,7 +392,7 @@ config DEBUG_KMEMLEAK_TEST
config DEBUG_PREEMPT
bool "Debug preemptible kernel"
- depends on DEBUG_KERNEL && PREEMPT && (TRACE_IRQFLAGS_SUPPORT || PPC64)
+ depends on DEBUG_KERNEL && PREEMPT && TRACE_IRQFLAGS_SUPPORT
default y
help
If you say Y here then the kernel will use a debug variant of the