diff --git a/[refs] b/[refs]
index a96819f7927a..ef20943df876 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f809226b9f4d3a89e42212fed7b482e8b30f77c
+refs/heads/master: fa7f1518e8a107e1feab0357b18c745b9a6927c5
diff --git a/trunk/drivers/serial/pxa.c b/trunk/drivers/serial/pxa.c
index af3a011b2b24..352fcb8926a6 100644
--- a/trunk/drivers/serial/pxa.c
+++ b/trunk/drivers/serial/pxa.c
@@ -585,11 +585,11 @@ serial_pxa_type(struct uart_port *port)
 	return up->name;
 }
 
-#ifdef CONFIG_SERIAL_PXA_CONSOLE
-
 static struct uart_pxa_port *serial_pxa_ports[4];
 static struct uart_driver serial_pxa_reg;
 
+#ifdef CONFIG_SERIAL_PXA_CONSOLE
+
 #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
 
 /*