diff --git a/[refs] b/[refs]
index 261a3a036569..7181af8c4494 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49abd90c4bb7b35e84c430dbba6b6368786fbf62
+refs/heads/master: 33aeb9da1b5248c8ffce046be4e992ff5d97d529
diff --git a/trunk/drivers/tty/serial/lpc32xx_hs.c b/trunk/drivers/tty/serial/lpc32xx_hs.c
index c01b58f3729c..dffea6b2cd7d 100644
--- a/trunk/drivers/tty/serial/lpc32xx_hs.c
+++ b/trunk/drivers/tty/serial/lpc32xx_hs.c
@@ -322,7 +322,7 @@ static void __serial_lpc32xx_tx(struct uart_port *port)
 static irqreturn_t serial_lpc32xx_interrupt(int irq, void *dev_id)
 {
 	struct uart_port *port = dev_id;
-	struct tty_port *port = &port->state->port;
+	struct tty_port *tport = &port->state->port;
 	u32 status;
 
 	spin_lock(&port->lock);