diff --git a/[refs] b/[refs]
index 0e7a5afe7187..5b5022463d54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c310e2b950c949cfc14754baed877eadb1a26f6b
+refs/heads/master: 196f29c8e8cd3352d26ed7bdf44f622e14adb931
diff --git a/trunk/drivers/char/watchdog/w83697hf_wdt.c b/trunk/drivers/char/watchdog/w83697hf_wdt.c
index 21e822e0eeec..32710a97b161 100644
--- a/trunk/drivers/char/watchdog/w83697hf_wdt.c
+++ b/trunk/drivers/char/watchdog/w83697hf_wdt.c
@@ -233,7 +233,7 @@ wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 	}
 
 	default:
-	  return -ENOIOCTLCMD;
+	  return -ENOTTY;
 	}
 	return 0;
 }