diff --git a/[refs] b/[refs]
index 17621a51a06b..6c447f76acf1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc98d9650891661a20842a8eef9e76536046d897
+refs/heads/master: 68e29655cc51761d60d5f27b2738816a5b13e415
diff --git a/trunk/drivers/char/nozomi.c b/trunk/drivers/char/nozomi.c
index dd3f9b1f11b4..294d03e8c61a 100644
--- a/trunk/drivers/char/nozomi.c
+++ b/trunk/drivers/char/nozomi.c
@@ -1828,7 +1828,6 @@ static int ntty_ioctl(struct tty_struct *tty, struct file *file,
 		      unsigned int cmd, unsigned long arg)
 {
 	struct port *port = tty->driver_data;
-	void __user *argp = (void __user *)arg;
 	int rval = -ENOIOCTLCMD;
 
 	DBG1("******** IOCTL, cmd: %d", cmd);