diff --git a/[refs] b/[refs]
index f1d00acd2b02..5d9dc3667ae5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a1f1a0b626d79071ee9fe91b7fcd28be6332677
+refs/heads/master: d8653d305ef66861c91fa7455fb8038460a7274c
diff --git a/trunk/drivers/tty/serial/mrst_max3110.c b/trunk/drivers/tty/serial/mrst_max3110.c
index b62857bf2fdb..37e13c3d91d9 100644
--- a/trunk/drivers/tty/serial/mrst_max3110.c
+++ b/trunk/drivers/tty/serial/mrst_max3110.c
@@ -51,7 +51,7 @@
 struct uart_max3110 {
 	struct uart_port port;
 	struct spi_device *spi;
-	char name[24];
+	char name[SPI_NAME_SIZE];
 
 	wait_queue_head_t wq;
 	struct task_struct *main_thread;