From 5da589340bdb1867bf617bec1273b359d47da5d2 Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Mon, 3 Jul 2006 09:03:47 +0200
Subject: [PATCH] --- yaml --- r: 37978 b: refs/heads/master c:
 2898172708aa84c9b0ce3865d6ff1ef76b538f51 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/char/watchdog/pnx4008_wdt.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e0122a372f68..22852e36bb9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9325fa36151fb9af39e697a6cd87e82667e2d8f9
+refs/heads/master: 2898172708aa84c9b0ce3865d6ff1ef76b538f51
diff --git a/trunk/drivers/char/watchdog/pnx4008_wdt.c b/trunk/drivers/char/watchdog/pnx4008_wdt.c
index 7ae2d0888218..d36a169c1b86 100644
--- a/trunk/drivers/char/watchdog/pnx4008_wdt.c
+++ b/trunk/drivers/char/watchdog/pnx4008_wdt.c
@@ -77,11 +77,7 @@
 
 #define WDOG_COUNTER_RATE 13000000	/*the counter clock is 13 MHz fixed */
 
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
-static int nowayout = 1;
-#else
-static int nowayout = 0;
-#endif
+static int nowayout = WATCHDOG_NOWAYOUT;
 static int heartbeat = DEFAULT_HEARTBEAT;
 
 static unsigned long wdt_status;