diff --git a/[refs] b/[refs]
index 3a53adb9936d..5da835eac8aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33c14ff838c3617616112b6dd833f2d7b70d6224
+refs/heads/master: ed48ac41b3c50ccf1c1faa6464f68a6233916c07
diff --git a/trunk/arch/arm/plat-samsung/gpiolib.c b/trunk/arch/arm/plat-samsung/gpiolib.c
index 8a8ba8bc1d96..c354089254fc 100644
--- a/trunk/arch/arm/plat-samsung/gpiolib.c
+++ b/trunk/arch/arm/plat-samsung/gpiolib.c
@@ -18,7 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/irq.h>
 #include <linux/io.h>
-#include <mach/gpio.h>
+#include <linux/gpio.h>
 #include <plat/gpio-core.h>
 #include <plat/gpio-cfg.h>
 #include <plat/gpio-cfg-helpers.h>