diff options
| author | Andrey Panin <pazke@donpac.ru> | 2005-07-27 14:43:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:25:54 -0400 |
| commit | 4bfdf37830111321e2cd1fe0102dd776ce93194d (patch) | |
| tree | 9791422b964d2aeae7772ac0462f1953e2f63447 /drivers/s390/char/vmwatchdog.c | |
| parent | 7657e20e46e26b198b24e2aefc696410bbe889c9 (diff) | |
[PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling
Attached patch removes #ifdef CONFIG_WATCHDOG_NOWAYOUT mess duplicated in
almost every watchdog driver and replaces it with common define in
linux/watchdog.h.
Signed-off-by: Andrey Panin <pazke@donpac.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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 @@ | |||
| 23 | static char vmwdt_cmd[MAX_CMDLEN] = "IPL"; | 23 | static char vmwdt_cmd[MAX_CMDLEN] = "IPL"; |
| 24 | static int vmwdt_conceal; | 24 | static int vmwdt_conceal; |
| 25 | 25 | ||
| 26 | #ifdef CONFIG_WATCHDOG_NOWAYOUT | 26 | static int vmwdt_nowayout = WATCHDOG_NOWAYOUT; |
| 27 | static int vmwdt_nowayout = 1; | ||
| 28 | #else | ||
| 29 | static int vmwdt_nowayout = 0; | ||
| 30 | #endif | ||
| 31 | 27 | ||
| 32 | MODULE_LICENSE("GPL"); | 28 | MODULE_LICENSE("GPL"); |
| 33 | MODULE_AUTHOR("Arnd Bergmann <arndb@de.ibm.com>"); | 29 | MODULE_AUTHOR("Arnd Bergmann <arndb@de.ibm.com>"); |