diff --git a/[refs] b/[refs]
index 6d2322dd4317..7022249544a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24ed3abaa13a9499d7454a1ed9830bb53b689b94
+refs/heads/master: 6af9a43d58f2ec455b752fb9534cf05c7e855dbe
diff --git a/trunk/drivers/char/tty_port.c b/trunk/drivers/char/tty_port.c
index 62dadfc95e34..4e862a75f7ff 100644
--- a/trunk/drivers/char/tty_port.c
+++ b/trunk/drivers/char/tty_port.c
@@ -193,7 +193,7 @@ int tty_port_block_til_ready(struct tty_port *port,
 {
 	int do_clocal = 0, retval;
 	unsigned long flags;
-	DECLARE_WAITQUEUE(wait, current);
+	DEFINE_WAIT(wait);
 	int cd;
 
 	/* block if port is in the process of being closed */