From: Wim Van Sebroeck <wim@iguana.be>
Date: Mon, 3 Jul 2006 07:03:47 +0000 (+0200)
Subject: [WATCHDOG] pnx4008_wdt.c - nowayout patch
X-Git-Tag: v2.6.19-rc1~370^2~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2898172708aa84c9b0ce3865d6ff1ef76b538f51;p=linux-2.6

[WATCHDOG] pnx4008_wdt.c - nowayout patch

Change nowayout to: WATCHDOG_NOWAYOUT as defined
in include/linux/watchdog.h .

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
---

diff --git a/drivers/char/watchdog/pnx4008_wdt.c b/drivers/char/watchdog/pnx4008_wdt.c
index 7ae2d08882..d36a169c1b 100644
--- a/drivers/char/watchdog/pnx4008_wdt.c
+++ b/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;