diff --git a/[refs] b/[refs]
index 5c269ee028e1..4288c0c9a70d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3b6e806cf7e45ac5e6ac0625cebafa4de3394aa
+refs/heads/master: 25947d5ac56004378d8c2d31ebf22600d5bc0c02
diff --git a/trunk/include/asm-generic/gpio.h b/trunk/include/asm-generic/gpio.h
index c764a8fcb058..0f99ad38b012 100644
--- a/trunk/include/asm-generic/gpio.h
+++ b/trunk/include/asm-generic/gpio.h
@@ -2,6 +2,7 @@
 #define _ASM_GENERIC_GPIO_H
 
 #include <linux/types.h>
+#include <linux/errno.h>
 
 #ifdef CONFIG_GPIOLIB