OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

This commit is contained in:
Linus Torvalds 2005-11-01 21:29:57 -08:00
parent fca324e79f de4ae58fc9
commit 0e016b9fa1
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/char/watchdog/mpcore_wdt.c
View File

@ -396,6 +396,7 @@ static int __devexit mpcore_wdt_remove(struct device *dev)
}
static struct device_driver mpcore_wdt_driver = {
.owner = THIS_MODULE,
.name = "mpcore_wdt",
.bus = &platform_bus_type,
.probe = mpcore_wdt_probe,

1
drivers/char/watchdog/mv64x60_wdt.c
View File

@ -213,6 +213,7 @@ static int __devexit mv64x60_wdt_remove(struct device *dev)
}
static struct device_driver mv64x60_wdt_driver = {
.owner = THIS_MODULE,
.name = MV64x60_WDT_NAME,
.bus = &platform_bus_type,
.probe = mv64x60_wdt_probe,

6
drivers/char/watchdog/pcwd_pci.c
View File

@ -1,7 +1,7 @@
/*
* Berkshire PCI-PC Watchdog Card Driver
*
* (c) Copyright 2003 Wim Van Sebroeck <wim@iguana.be>.
* (c) Copyright 2003-2005 Wim Van Sebroeck <wim@iguana.be>.
*
* Based on source code of the following authors:
* Ken Hollis <kenji@bitgate.com>,
@ -21,7 +21,9 @@
*/
/*
* A bells and whistles driver is available from http://www.pcwd.de/
* A bells and whistles driver is available from:
* http://www.kernel.org/pub/linux/kernel/people/wim/pcwd/pcwd_pci/
*
* More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/
*/

1
drivers/char/watchdog/s3c2410_wdt.c
View File

@ -497,6 +497,7 @@ static int s3c2410wdt_resume(struct device *dev)
static struct device_driver s3c2410wdt_driver = {
.owner = THIS_MODULE,
.name = "s3c2410-wdt",
.bus = &platform_bus_type,
.probe = s3c2410wdt_probe,

2
drivers/char/watchdog/w83627hf_wdt.c
View File

@ -359,5 +359,5 @@ module_exit(wdt_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Pádraig Brady <P@draigBrady.com>");
MODULE_DESCRIPTION("w38627hf WDT driver");
MODULE_DESCRIPTION("w83627hf WDT driver");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);