diff --git a/[refs] b/[refs]
index 7f548ebfb43a..d6ef6409c328 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1398f679dfa167bfc656803ea86a8d1a984cbaf1
+refs/heads/master: 558de8a74efe37a4b5e2ef944da17d23e701dd98
diff --git a/trunk/include/asm-arm/arch-davinci/gpio.h b/trunk/include/asm-arm/arch-davinci/gpio.h
index ea24a0e0bfd6..ff8de30b2fb3 100644
--- a/trunk/include/asm-arm/arch-davinci/gpio.h
+++ b/trunk/include/asm-arm/arch-davinci/gpio.h
@@ -13,6 +13,9 @@
 #ifndef	__DAVINCI_GPIO_H
 #define	__DAVINCI_GPIO_H
 
+#include <linux/io.h>
+#include <asm/hardware.h>
+
 /*
  * basic gpio routines
  *