diff options
author | Steve French <sfrench@us.ibm.com> | 2008-04-15 20:38:29 +0200 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-04-15 20:38:29 +0200 |
commit | e48d199ba10bb8267f491a3a585ca4a833e950a4 (patch) | |
tree | c7d308a42479c8f21aaef889abfa004b0f1bb482 /drivers/watchdog/txx9wdt.c | |
parent | [CIFS] Fix acl length when very short ACL being modified by chmod (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25 (diff) | |
download | linux-e48d199ba10bb8267f491a3a585ca4a833e950a4.tar.xz linux-e48d199ba10bb8267f491a3a585ca4a833e950a4.zip |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/watchdog/txx9wdt.c')
-rw-r--r-- | drivers/watchdog/txx9wdt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c index 328b3c7211ef..57cefef27ce3 100644 --- a/drivers/watchdog/txx9wdt.c +++ b/drivers/watchdog/txx9wdt.c @@ -274,3 +274,4 @@ module_exit(watchdog_exit); MODULE_DESCRIPTION("TXx9 Watchdog Driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); +MODULE_ALIAS("platform:txx9wdt"); |