diff --git a/[refs] b/[refs]
index 774a16f2511f..60ef0efb95e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 391c970c0dd1100e3b9e1681f7d0f20aac35455a
+refs/heads/master: 2e13cba8dc35774bf1d7169733e876c5b7adee54
diff --git a/trunk/drivers/of/gpio.c b/trunk/drivers/of/gpio.c
index 09f05a178668..905960338fb2 100644
--- a/trunk/drivers/of/gpio.c
+++ b/trunk/drivers/of/gpio.c
@@ -11,13 +11,14 @@
  * (at your option) any later version.
  */
 
-#include <linux/kernel.h>
+#include <linux/device.h>
 #include <linux/errno.h>
+#include <linux/module.h>
 #include <linux/io.h>
 #include <linux/of.h>
-#include <linux/slab.h>
+#include <linux/of_address.h>
 #include <linux/of_gpio.h>
-#include <asm/prom.h>
+#include <linux/slab.h>
 
 /**
  * of_get_gpio_flags - Get a GPIO number and flags to use with GPIO API