diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-01 21:29:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-01 21:29:57 -0800 |
| commit | 0e016b9fa134d79341cca5e336ccbcea066d5f81 (patch) | |
| tree | 2f0b00b0dd43faaa385779c3c33b2c98b253863a | |
| parent | fca324e79fa30d4e64ac15554601a86392999ae6 (diff) | |
| parent | de4ae58fc9f46482f96306301011dfc8b404491f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
| -rw-r--r-- | drivers/char/watchdog/mpcore_wdt.c | 1 | ||||
| -rw-r--r-- | drivers/char/watchdog/mv64x60_wdt.c | 1 | ||||
| -rw-r--r-- | drivers/char/watchdog/pcwd_pci.c | 6 | ||||
| -rw-r--r-- | drivers/char/watchdog/s3c2410_wdt.c | 1 | ||||
| -rw-r--r-- | drivers/char/watchdog/w83627hf_wdt.c | 2 |
5 files changed, 8 insertions, 3 deletions
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c index 47a5f6ab487..da631c114fd 100644 --- a/drivers/char/watchdog/mpcore_wdt.c +++ b/drivers/char/watchdog/mpcore_wdt.c @@ -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, diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c index 04e0d7e9680..119b3c541d9 100644 --- a/drivers/char/watchdog/mv64x60_wdt.c +++ b/drivers/char/watchdog/mv64x60_wdt.c @@ -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, diff --git a/drivers/char/watchdog/pcwd_pci.c b/drivers/char/watchdog/pcwd_pci.c index 5308e5c8f29..d9ef55bdf88 100644 --- a/drivers/char/watchdog/pcwd_pci.c +++ b/drivers/char/watchdog/pcwd_pci.c @@ -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/ */ diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c index e7e20a6d64b..751cb77b071 100644 --- a/drivers/char/watchdog/s3c2410_wdt.c +++ b/drivers/char/watchdog/s3c2410_wdt.c @@ -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, diff --git a/drivers/char/watchdog/w83627hf_wdt.c b/drivers/char/watchdog/w83627hf_wdt.c index b5d82101542..d15ca9a3986 100644 --- a/drivers/char/watchdog/w83627hf_wdt.c +++ b/drivers/char/watchdog/w83627hf_wdt.c @@ -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); |