From 7bbf14871011f9f5eb3e8840f59cd1106eb89074 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 13 May 2010 02:30:49 +0200
Subject: [PATCH] --- yaml --- r: 205396 b: refs/heads/master c:
 19cc36c0f0457e5c6629ec24036fbbe8255c88ec h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/sched.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 22333173be75..876d4e346c5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89d7ce2a2178e7f562f608b466a18c8c2ece87af
+refs/heads/master: 19cc36c0f0457e5c6629ec24036fbbe8255c88ec
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 33f9b2ad0bbb..3958e0cd24f7 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -311,7 +311,7 @@ extern void scheduler_tick(void);
 
 extern void sched_show_task(struct task_struct *p);
 
-#ifdef CONFIG_DETECT_SOFTLOCKUP
+#ifdef CONFIG_LOCKUP_DETECTOR
 extern void touch_softlockup_watchdog(void);
 extern void touch_softlockup_watchdog_sync(void);
 extern void touch_all_softlockup_watchdogs(void);