diff --git a/[refs] b/[refs]
index fc6256d6527c..19ac2f6d91c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6abe78bf195c633f67f6349e3d09b2bcd5d32a79
+refs/heads/master: 1bf1496d41756496db2fcf4c8f1932b9762232f6
diff --git a/trunk/drivers/char/watchdog/omap_wdt.c b/trunk/drivers/char/watchdog/omap_wdt.c
index 3a0e0613424a..719b066f73c4 100644
--- a/trunk/drivers/char/watchdog/omap_wdt.c
+++ b/trunk/drivers/char/watchdog/omap_wdt.c
@@ -197,7 +197,7 @@ omap_wdt_ioctl(struct inode *inode, struct file *file,
 
 	switch (cmd) {
 	default:
-		return -ENOIOCTLCMD;
+		return -ENOTTY;
 	case WDIOC_GETSUPPORT:
 		return copy_to_user((struct watchdog_info __user *)arg, &ident,
 				sizeof(ident));