diff --git a/[refs] b/[refs]
index 8874842f8d3a..631b21b70808 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2308c954f55eae9f165a5a59bbdb0a0c586afe5a
+refs/heads/master: d14b3dd6190af7ce4f88be68f8df828af6d44584
diff --git a/trunk/arch/powerpc/sysdev/qe_lib/gpio.c b/trunk/arch/powerpc/sysdev/qe_lib/gpio.c
index c712e245dc4c..8e5a0bc36d0b 100644
--- a/trunk/arch/powerpc/sysdev/qe_lib/gpio.c
+++ b/trunk/arch/powerpc/sysdev/qe_lib/gpio.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/of.h>
@@ -102,7 +103,7 @@ static int qe_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 	return 0;
 }
 
-void __init qe_add_gpiochips(void)
+static int __init qe_add_gpiochips(void)
 {
 	struct device_node *np;
 
@@ -143,4 +144,6 @@ void __init qe_add_gpiochips(void)
 		kfree(qe_gc);
 		/* try others anyway */
 	}
+	return 0;
 }
+arch_initcall(qe_add_gpiochips);
diff --git a/trunk/include/asm-powerpc/qe.h b/trunk/include/asm-powerpc/qe.h
index 1355e7267013..edee15d269ea 100644
--- a/trunk/include/asm-powerpc/qe.h
+++ b/trunk/include/asm-powerpc/qe.h
@@ -101,7 +101,6 @@ struct qe_pio_regs {
 #endif
 };
 
-extern void __init qe_add_gpiochips(void);
 extern int par_io_init(struct device_node *np);
 extern int par_io_of_config(struct device_node *np);
 #define QE_PIO_DIR_IN	2