diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 09:00:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 09:00:45 -0400 |
| commit | 67d2c36e901403bb97cb79ddb44d702c3284d0ba (patch) | |
| tree | 872805a9402f8186584075f1a8cf804b9606efea /drivers/char/watchdog/ixp4xx_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/ixp4xx_wdt.c')
| -rw-r--r-- | drivers/char/watchdog/ixp4xx_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c index 8d916afbf4fa..b5be8b11104a 100644 --- a/drivers/char/watchdog/ixp4xx_wdt.c +++ b/drivers/char/watchdog/ixp4xx_wdt.c | |||
| @@ -176,7 +176,7 @@ static struct file_operations ixp4xx_wdt_fops = | |||
| 176 | static struct miscdevice ixp4xx_wdt_miscdev = | 176 | static struct miscdevice ixp4xx_wdt_miscdev = |
| 177 | { | 177 | { |
| 178 | .minor = WATCHDOG_MINOR, | 178 | .minor = WATCHDOG_MINOR, |
| 179 | .name = "IXP4xx Watchdog", | 179 | .name = "watchdog", |
| 180 | .fops = &ixp4xx_wdt_fops, | 180 | .fops = &ixp4xx_wdt_fops, |
| 181 | }; | 181 | }; |
| 182 | 182 | ||