diff --git a/[refs] b/[refs]
index ccf98ebdc7fe..b1217bcceb7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1a8b69afd63f26f8e7be39e3bc78c4894cdb9fd
+refs/heads/master: ab17da5cb9d4aaf9f04c706761d3a8024897bedd
diff --git a/trunk/drivers/tty/serial/apbuart.c b/trunk/drivers/tty/serial/apbuart.c
index 77554fd68d1f..7162f70d9260 100644
--- a/trunk/drivers/tty/serial/apbuart.c
+++ b/trunk/drivers/tty/serial/apbuart.c
@@ -577,7 +577,7 @@ static int __devinit apbuart_probe(struct platform_device *op)
 	return 0;
 }
 
-static struct of_device_id __initdata apbuart_match[] = {
+static struct of_device_id apbuart_match[] = {
 	{
 	 .name = "GAISLER_APBUART",
 	 },
@@ -597,7 +597,7 @@ static struct platform_driver grlib_apbuart_of_driver = {
 };
 
 
-static int grlib_apbuart_configure(void)
+static int __init grlib_apbuart_configure(void)
 {
 	struct device_node *np;
 	int line = 0;