---

yaml --- r: 100646 b: refs/heads/master c: b5c21b4 h: refs/heads/master v: v3
git-mirror · Jul 11, 2008 · cdf8995 · cdf8995
1 parent 3a1a08c
commit cdf8995
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e16c0a081f6c93f04c6af784d6a160955269f91
+refs/heads/master: b5c21b4514b38f450848feb432f7120376d01ffe
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -1341,7 +1341,7 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
 		   "server",
 #elif defined(CONFIG_PREEMPT_VOLUNTARY)
 		   "desktop",
-#elif defined(CONFIG_PREEMPT_DESKTOP)
+#elif defined(CONFIG_PREEMPT)
 		   "preempt",
 #else
 		   "unknown",