diff --git a/[refs] b/[refs]
index 4d14eb62b4b7..2dbb39903eca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c171ac36b74f6c90bc7a03c309136ba175314b6d
+refs/heads/master: 2d0db6bf5010c26beb1ccbd4ee50991fd2c05d90
diff --git a/trunk/drivers/staging/android/timed_gpio.c b/trunk/drivers/staging/android/timed_gpio.c
index bea68c9fc942..b41b20e34628 100644
--- a/trunk/drivers/staging/android/timed_gpio.c
+++ b/trunk/drivers/staging/android/timed_gpio.c
@@ -18,7 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/hrtimer.h>
 #include <linux/err.h>
-#include <asm/arch/gpio.h>
+#include <linux/gpio.h>
 
 #include "timed_gpio.h"