diff --git a/[refs] b/[refs]
index 78cd71a88e70..aad644122b07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7e566fa26b7d34514d5ba7b8b4464934be8ff2c
+refs/heads/master: a01366b4b5cc669633d1cf6ee327c85a5406ef5f
diff --git a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
index 3066fa7e5374..5f8f571665a0 100644
--- a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -121,20 +121,6 @@
  * # amixer set "Headphone" 50
  */
 
-/*
- * FIXME !!
- *
- * gpio_no_direction
- *
- * current gpio frame work doesn't have
- * the method to control only pull up/down/free.
- * this function should be replaced by correct gpio function
- */
-static void __init gpio_no_direction(u32 addr)
-{
-	__raw_writeb(0x00, addr);
-}
-
 /*
  * USB function
  *
@@ -1087,8 +1073,8 @@ static void __init eva_init(void)
 
 	gpio_request(GPIO_PORT7, NULL);
 	gpio_request(GPIO_PORT8, NULL);
-	gpio_no_direction(GPIO_PORT7CR); /* FSIAOBT needs no direction */
-	gpio_no_direction(GPIO_PORT8CR); /* FSIAOLR needs no direction */
+	gpio_direction_none(GPIO_PORT7CR); /* FSIAOBT needs no direction */
+	gpio_direction_none(GPIO_PORT8CR); /* FSIAOLR needs no direction */
 
 	/* FSI-HDMI */
 	gpio_request(GPIO_FN_FSIBCK,		NULL);