summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/mtx-1_wdt.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-04-15 20:38:29 +0200
committerSteve French <sfrench@us.ibm.com>2008-04-15 20:38:29 +0200
commite48d199ba10bb8267f491a3a585ca4a833e950a4 (patch)
treec7d308a42479c8f21aaef889abfa004b0f1bb482 /drivers/watchdog/mtx-1_wdt.c
parent[CIFS] Fix acl length when very short ACL being modified by chmod (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25 (diff)
downloadlinux-e48d199ba10bb8267f491a3a585ca4a833e950a4.tar.xz
linux-e48d199ba10bb8267f491a3a585ca4a833e950a4.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/watchdog/mtx-1_wdt.c')
-rw-r--r--drivers/watchdog/mtx-1_wdt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 10b89f2703bd..a8e67383784e 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -243,6 +243,7 @@ static struct platform_driver mtx1_wdt = {
.probe = mtx1_wdt_probe,
.remove = mtx1_wdt_remove,
.driver.name = "mtx1-wdt",
+ .driver.owner = THIS_MODULE,
};
static int __init mtx1_wdt_init(void)
@@ -262,3 +263,4 @@ MODULE_AUTHOR("Michael Stickel, Florian Fainelli");
MODULE_DESCRIPTION("Driver for the MTX-1 watchdog");
MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:mtx1-wdt");