diff options
author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 06:00:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 06:00:45 -0700 |
commit | 67d2c36e901403bb97cb79ddb44d702c3284d0ba (patch) | |
tree | 872805a9402f8186584075f1a8cf804b9606efea /drivers/char/watchdog/ixp2000_wdt.c | |
parent | 94f8c66e5e543d79231abf203d6e514ecb668688 (diff) | |
parent | 1cc77248106aafc12ba529953f652d6f8db2c84d (diff) |
Merge watchdog driver updates
Automated merge from
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
failed due to duplicate different changes to Kconfig file. Manually fixed
up. Hopefully.
Diffstat (limited to 'drivers/char/watchdog/ixp2000_wdt.c')
-rw-r--r-- | drivers/char/watchdog/ixp2000_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c index e7640bc4904..0cfb9b9c4a4 100644 --- a/drivers/char/watchdog/ixp2000_wdt.c +++ b/drivers/char/watchdog/ixp2000_wdt.c @@ -182,7 +182,7 @@ static struct file_operations ixp2000_wdt_fops = static struct miscdevice ixp2000_wdt_miscdev = { .minor = WATCHDOG_MINOR, - .name = "IXP2000 Watchdog", + .name = "watchdog", .fops = &ixp2000_wdt_fops, }; |