diff options
author | Roland Dreier | 2005-07-28 04:12:56 +0200 |
---|---|---|
committer | Roland Dreier | 2005-07-28 04:12:56 +0200 |
commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /drivers/s390/char/vmwatchdog.c | |
parent | [IB/mthca]: Use io_remap_pfn_range for PCI space (diff) | |
parent | [PATCH] new alpha syscalls (diff) | |
download | kernel-qcow2-linux-2868bd281fef21d1e73d6b7648a41efc3d75f10c.tar.gz kernel-qcow2-linux-2868bd281fef21d1e73d6b7648a41efc3d75f10c.tar.xz kernel-qcow2-linux-2868bd281fef21d1e73d6b7648a41efc3d75f10c.zip |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'drivers/s390/char/vmwatchdog.c')
-rw-r--r-- | drivers/s390/char/vmwatchdog.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c index 22cf4fec8da9..5473c23fcb52 100644 --- a/drivers/s390/char/vmwatchdog.c +++ b/drivers/s390/char/vmwatchdog.c @@ -23,11 +23,7 @@ static char vmwdt_cmd[MAX_CMDLEN] = "IPL"; static int vmwdt_conceal; -#ifdef CONFIG_WATCHDOG_NOWAYOUT -static int vmwdt_nowayout = 1; -#else -static int vmwdt_nowayout = 0; -#endif +static int vmwdt_nowayout = WATCHDOG_NOWAYOUT; MODULE_LICENSE("GPL"); MODULE_AUTHOR("Arnd Bergmann <arndb@de.ibm.com>"); |