diff options
author | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
commit | 1e42198609d73ed1a9adcba2af275c24c2678420 (patch) | |
tree | 32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /drivers/watchdog/mtx-1_wdt.c | |
parent | 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff) | |
parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) |
Merge branch 'master' of master.kernel.org:/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.c | 2 |
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 = { | |||
243 | .probe = mtx1_wdt_probe, | 243 | .probe = mtx1_wdt_probe, |
244 | .remove = mtx1_wdt_remove, | 244 | .remove = mtx1_wdt_remove, |
245 | .driver.name = "mtx1-wdt", | 245 | .driver.name = "mtx1-wdt", |
246 | .driver.owner = THIS_MODULE, | ||
246 | }; | 247 | }; |
247 | 248 | ||
248 | static int __init mtx1_wdt_init(void) | 249 | static int __init mtx1_wdt_init(void) |
@@ -262,3 +263,4 @@ MODULE_AUTHOR("Michael Stickel, Florian Fainelli"); | |||
262 | MODULE_DESCRIPTION("Driver for the MTX-1 watchdog"); | 263 | MODULE_DESCRIPTION("Driver for the MTX-1 watchdog"); |
263 | MODULE_LICENSE("GPL"); | 264 | MODULE_LICENSE("GPL"); |
264 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 265 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
266 | MODULE_ALIAS("platform:mtx1-wdt"); | ||