summaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog/scx200_wdt.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-08 05:41:28 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-08 05:41:28 -0400
commit142e27fc8a3619471669d6241784eec9167c47d1 (patch)
treee88850b63ec910ee28874f93c43fb66421bb8119 /drivers/char/watchdog/scx200_wdt.c
parenta9053d0494d3c92807701c0f47df61d50c971581 (diff)
parentcaf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff)
downloadblackbird-op-linux-142e27fc8a3619471669d6241784eec9167c47d1.tar.gz
blackbird-op-linux-142e27fc8a3619471669d6241784eec9167c47d1.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/char/watchdog/scx200_wdt.c')
-rw-r--r--drivers/char/watchdog/scx200_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c
index c4568569f3a8..b4a102a2d7e3 100644
--- a/drivers/char/watchdog/scx200_wdt.c
+++ b/drivers/char/watchdog/scx200_wdt.c
@@ -206,7 +206,7 @@ static struct file_operations scx200_wdt_fops = {
static struct miscdevice scx200_wdt_miscdev = {
.minor = WATCHDOG_MINOR,
- .name = NAME,
+ .name = "watchdog",
.fops = &scx200_wdt_fops,
};
OpenPOWER on IntegriCloud