diff --git a/[refs] b/[refs]
index e24a3ab29f25..e3a8906d4768 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bcf6135c3e8cdfab375f4041a48721483519eee
+refs/heads/master: ec312310e43acd5bb8b49314c6d472bb60d2d30c
diff --git a/trunk/drivers/char/pc8736x_gpio.c b/trunk/drivers/char/pc8736x_gpio.c
index 72dcf222f141..1c706ccfdbb3 100644
--- a/trunk/drivers/char/pc8736x_gpio.c
+++ b/trunk/drivers/char/pc8736x_gpio.c
@@ -15,12 +15,12 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/mutex.h>
 #include <linux/nsc_gpio.h>
 #include <linux/platform_device.h>
 #include <asm/uaccess.h>
-#include <asm/io.h>
 
 #define DEVNAME "pc8736x_gpio"