diff options
| author | <greg@echidna.(none)> | 2005-09-05 09:20:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 09:20:31 -0700 |
| commit | 4e0c64cfc1126a2946487d4771168458bb9ba9be (patch) | |
| tree | 1825887c36f029ca795561cc428fd6a2585cb5fa /drivers/char/watchdog/ixp2000_wdt.c | |
| parent | fae91e72b79ba9a21f0ce7551a1fd7e8984c85a6 (diff) | |
| parent | 67d2c36e901403bb97cb79ddb44d702c3284d0ba (diff) | |
Merge HEAD from gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git
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, }; |