diff --git a/[refs] b/[refs]
index 78c8c861b9ed..b069a66ca253 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00b3b3e6605d7446cd410c7c9bb98f5336a15ca1
+refs/heads/master: 0835caa2bf1933d5f41fd98e469107f4c00d547f
diff --git a/trunk/drivers/char/watchdog/pc87413_wdt.c b/trunk/drivers/char/watchdog/pc87413_wdt.c
index 4d5612146cde..bd7727ba1ad9 100644
--- a/trunk/drivers/char/watchdog/pc87413_wdt.c
+++ b/trunk/drivers/char/watchdog/pc87413_wdt.c
@@ -362,7 +362,7 @@ static int pc87413_release(struct inode *inode, struct file *file)
 
 static int pc87413_status(void)
 {
-	  return 1; /* currently not supported */
+	  return 0; /* currently not supported */
 }
 
 /**
@@ -626,7 +626,7 @@ MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 module_param(io, int, 0);
-MODULE_PARM_DESC(wdt_io, MODNAME " I/O port (default: " __MODULE_STRING(io) ").");
+MODULE_PARM_DESC(io, MODNAME " I/O port (default: " __MODULE_STRING(io) ").");
 
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in minutes (default=" __MODULE_STRING(timeout) ").");