summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2006-09-07 11:57:00 +0200
committerWim Van Sebroeck <wim@iguana.be>2006-10-04 22:44:21 +0200
commitde710d6871c7f569da007f1074710fadf1708c29 (patch)
tree54855dd2ec97136eff9dcc50180aef74510cec6e /drivers
parent44d7d3282baa4080b73adca31648e6ef1e191874 (diff)
downloadop-kernel-dev-de710d6871c7f569da007f1074710fadf1708c29.zip
op-kernel-dev-de710d6871c7f569da007f1074710fadf1708c29.tar.gz
[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')
-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 c44f281..ad397f9 100644
--- a/drivers/char/watchdog/w83697hf_wdt.c
+++ b/drivers/char/watchdog/w83697hf_wdt.c
@@ -1,9 +1,10 @@
/*
- * w83697hf WDT driver
+ * w83697hf/hg WDT driver
*
* (c) Copyright 2006 Marcus Junker <junker@anduras.de>
*
- * Based on w83627hf_wdt.c advantechwdt.c which is based on wdt.c.
+ * Based on w83627hf_wdt.c which is based on advantechwdt.c
+ * which is based on wdt.c.
* Original copyright messages:
*
* (c) Copyright 2003 Pádraig Brady <P@draigBrady.com>
@@ -39,7 +40,7 @@
#include <asm/uaccess.h>
#include <asm/system.h>
-#define WATCHDOG_NAME "w83697hf WDT"
+#define WATCHDOG_NAME "w83697hf/hg WDT"
#define PFX WATCHDOG_NAME ": "
#define WATCHDOG_TIMEOUT 60 /* 60 sec default timeout */
@@ -313,7 +314,7 @@ wdt_init(void)
spin_lock_init(&io_lock);
- printk (KERN_INFO "WDT driver for the Winbond(TM) W83697HF Super I/O chip initialising.\n");
+ printk (KERN_INFO PFX "WDT driver for W83697HF/HG initializing\n");
if (wdt_set_heartbeat(timeout)) {
wdt_set_heartbeat(WATCHDOG_TIMEOUT);
@@ -369,5 +370,5 @@ module_exit(wdt_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Marcus Junker <junker@anduras.de>");
-MODULE_DESCRIPTION("w83697hf WDT driver");
+MODULE_DESCRIPTION("w83697hf/hg WDT driver");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
OpenPOWER on IntegriCloud