Pull update-tlbflush-sn into release branch

[linux-2.6-omap-h63xx.git] / drivers / char / watchdog / scx200_wdt.c

diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c
index c4568569f3a8cf9fe3561c80881ba99580563dc4..b4a102a2d7e390cfa3774d0a6c7871756e6b11ec 100644 (file)
--- 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,
 };