diff --git a/[refs] b/[refs]
index a4c870a561d6..efb5b4b41d2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac8a1014804c23c96e3f757145f73e1351c34365
+refs/heads/master: 18ad7a61e1b700dfe177fabf1c350b4f5d4da8ac
diff --git a/trunk/include/linux/of_gpio.h b/trunk/include/linux/of_gpio.h
index 2ee97e9877a7..67db101d0eb8 100644
--- a/trunk/include/linux/of_gpio.h
+++ b/trunk/include/linux/of_gpio.h
@@ -15,7 +15,7 @@
 #define __LINUX_OF_GPIO_H
 
 #include <linux/errno.h>
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 #ifdef CONFIG_OF_GPIO