diff --git a/[refs] b/[refs]
index c8d2b0efd068..71ea598e0fc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d828c458f77043ddd9626ee0cfa688dda99c0eb
+refs/heads/master: cf160bc9269fecba0a10e9957e8591fcc293dddf
diff --git a/trunk/drivers/staging/vt6655/device.h b/trunk/drivers/staging/vt6655/device.h
index 56e05f0fa963..9e236f745ce5 100644
--- a/trunk/drivers/staging/vt6655/device.h
+++ b/trunk/drivers/staging/vt6655/device.h
@@ -48,10 +48,10 @@
 #include <linux/wait.h>
 #include <linux/if_arp.h>
 #include <linux/sched.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/if.h>
 //#include <linux/config.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/proc_fs.h>
 #include <linux/inetdevice.h>
 #include <linux/reboot.h>