diff --git a/[refs] b/[refs]
index 94c11ffbc5cb..ac65269d8142 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 951880e634a79884236a575b896abf55c39ae0bf
+refs/heads/master: 20c300b10c358daa507be335aec6aa3987ef425a
diff --git a/trunk/include/linux/tty_driver.h b/trunk/include/linux/tty_driver.h
index ecdaeb98b293..5cf685086dd3 100644
--- a/trunk/include/linux/tty_driver.h
+++ b/trunk/include/linux/tty_driver.h
@@ -312,7 +312,6 @@ struct tty_driver {
 	 */
 	struct tty_struct **ttys;
 	struct ktermios **termios;
-	struct ktermios **termios_locked;
 	void *driver_state;
 
 	/*