Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40232
b: refs/heads/master
c: de710d6
h: refs/heads/master
v: v3
  • Loading branch information
Samuel Tardieu authored and Wim Van Sebroeck committed Oct 4, 2006
1 parent d940ae4 commit c075de5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 44d7d3282baa4080b73adca31648e6ef1e191874
refs/heads/master: de710d6871c7f569da007f1074710fadf1708c29
11 changes: 6 additions & 5 deletions trunk/drivers/char/watchdog/w83697hf_wdt.c
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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 */

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

0 comments on commit c075de5

Please sign in to comment.