aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2006-09-07 05:57:00 -0400
committerWim Van Sebroeck <wim@iguana.be>2006-10-04 16:44:21 -0400
commitde710d6871c7f569da007f1074710fadf1708c29 (patch)
tree54855dd2ec97136eff9dcc50180aef74510cec6e /drivers/char
parent44d7d3282baa4080b73adca31648e6ef1e191874 (diff)
[WATCHDOG] w83697hf/hg WDT driver - patch 6
This is patch 6 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - The driver works for both the w83697hf and the w83697hg chipset's. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/watchdog/w83697hf_wdt.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/char/watchdog/w83697hf_wdt.c b/drivers/char/watchdog/w83697hf_wdt.c
index c44f281f3565..ad397f912bd4 100644
--- a/drivers/char/watchdog/w83697hf_wdt.c
+++ b/drivers/char/watchdog/w83697hf_wdt.c
@@ -1,9 +1,10 @@
1/* 1/*
2 * w83697hf WDT driver 2 * w83697hf/hg WDT driver
3 * 3 *
4 * (c) Copyright 2006 Marcus Junker <junker@anduras.de> 4 * (c) Copyright 2006 Marcus Junker <junker@anduras.de>
5 * 5 *
6 * Based on w83627hf_wdt.c advantechwdt.c which is based on wdt.c. 6 * Based on w83627hf_wdt.c which is based on advantechwdt.c
7 * which is based on wdt.c.
7 * Original copyright messages: 8 * Original copyright messages:
8 * 9 *
9 * (c) Copyright 2003 Pádraig Brady <P@draigBrady.com> 10 * (c) Copyright 2003 Pádraig Brady <P@draigBrady.com>
@@ -39,7 +40,7 @@
39#include <asm/uaccess.h> 40#include <asm/uaccess.h>
40#include <asm/system.h> 41#include <asm/system.h>
41 42
42#define WATCHDOG_NAME "w83697hf WDT" 43#define WATCHDOG_NAME "w83697hf/hg WDT"
43#define PFX WATCHDOG_NAME ": " 44#define PFX WATCHDOG_NAME ": "
44#define WATCHDOG_TIMEOUT 60 /* 60 sec default timeout */ 45#define WATCHDOG_TIMEOUT 60 /* 60 sec default timeout */
45 46
@@ -313,7 +314,7 @@ wdt_init(void)
313 314
314 spin_lock_init(&io_lock); 315 spin_lock_init(&io_lock);
315 316
316 printk (KERN_INFO "WDT driver for the Winbond(TM) W83697HF Super I/O chip initialising.\n"); 317 printk (KERN_INFO PFX "WDT driver for W83697HF/HG initializing\n");
317 318
318 if (wdt_set_heartbeat(timeout)) { 319 if (wdt_set_heartbeat(timeout)) {
319 wdt_set_heartbeat(WATCHDOG_TIMEOUT); 320 wdt_set_heartbeat(WATCHDOG_TIMEOUT);
@@ -369,5 +370,5 @@ module_exit(wdt_exit);
369 370
370MODULE_LICENSE("GPL"); 371MODULE_LICENSE("GPL");
371MODULE_AUTHOR("Marcus Junker <junker@anduras.de>"); 372MODULE_AUTHOR("Marcus Junker <junker@anduras.de>");
372MODULE_DESCRIPTION("w83697hf WDT driver"); 373MODULE_DESCRIPTION("w83697hf/hg WDT driver");
373MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 374MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);