diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2011-08-02 22:14:02 +0200 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-08-02 22:14:02 +0200 |
commit | 3d071cd313643cf82b1ce1ce4fdf08d63ad53964 (patch) | |
tree | 874c1683f32f07614aa123f6ca5cf6c2bd443704 /drivers/watchdog/gef_wdt.c | |
parent | arch/tile: remove useless set_fixmap_nocache() macro (diff) | |
parent | Linux 3.0 (diff) | |
download | linux-3d071cd313643cf82b1ce1ce4fdf08d63ad53964.tar.xz linux-3d071cd313643cf82b1ce1ce4fdf08d63ad53964.zip |
Merge tag 'v3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/watchdog/gef_wdt.c')
-rw-r--r-- | drivers/watchdog/gef_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c index 29a7cd4b90c8..b146082bd85a 100644 --- a/drivers/watchdog/gef_wdt.c +++ b/drivers/watchdog/gef_wdt.c @@ -329,4 +329,4 @@ MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com>"); MODULE_DESCRIPTION("GE watchdog driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); -MODULE_ALIAS("platform: gef_wdt"); +MODULE_ALIAS("platform:gef_wdt"); |