diff --git a/[refs] b/[refs]
index 5331fc534356..b1894f9f01e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b63d4f0fb80918ab37b6c0ee1adcd49e05c9994c
+refs/heads/master: 832f4ede791ae0a96dcbb231ccb181ad7a54bfc2
diff --git a/trunk/drivers/serial/sa1100.c b/trunk/drivers/serial/sa1100.c
index 0e3daf6d7b50..25a086458ab9 100644
--- a/trunk/drivers/serial/sa1100.c
+++ b/trunk/drivers/serial/sa1100.c
@@ -161,7 +161,6 @@ static void sa1100_stop_tx(struct uart_port *port)
 static void sa1100_start_tx(struct uart_port *port)
 {
 	struct sa1100_port *sport = (struct sa1100_port *)port;
-	unsigned long flags;
 	u32 utcr3;
 
 	utcr3 = UART_GET_UTCR3(sport);