summaryrefslogtreecommitdiff
path: root/drivers/char/watchdog/ixp2000_wdt.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-07-31 02:14:15 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-07-31 02:14:15 +0400
commita670fcb43f01a67ef56176afc76e5d43d128b25c (patch)
tree09c9411c78a33ff980e9ea871bc7686e7589abbf /drivers/char/watchdog/ixp2000_wdt.c
parent327309e899662b482c58cf25f574513d38b5788c (diff)
parentb0825488a642cadcf39709961dde61440cb0731c (diff)
downloadlinux-a670fcb43f01a67ef56176afc76e5d43d128b25c.tar.xz
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'drivers/char/watchdog/ixp2000_wdt.c')
-rw-r--r--drivers/char/watchdog/ixp2000_wdt.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
index 4b039516cc86..e7640bc4904b 100644
--- a/drivers/char/watchdog/ixp2000_wdt.c
+++ b/drivers/char/watchdog/ixp2000_wdt.c
@@ -30,11 +30,7 @@
#include <asm/hardware.h>
#include <asm/uaccess.h>
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
-static int nowayout = 1;
-#else
-static int nowayout = 0;
-#endif
+static int nowayout = WATCHDOG_NOWAYOUT;
static unsigned int heartbeat = 60; /* (secs) Default is 1 minute */
static unsigned long wdt_status;