diff --git a/[refs] b/[refs]
index a8ce7f8c51fd..594606d89133 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be763c940fc3ccdaeda238e3ef5840961b649740
+refs/heads/master: 5aedcf50e547e37b89d105efc4a2f0f1b0217af4
diff --git a/trunk/drivers/net/lib8390.c b/trunk/drivers/net/lib8390.c
index b0ee6f67061b..946b255a78f0 100644
--- a/trunk/drivers/net/lib8390.c
+++ b/trunk/drivers/net/lib8390.c
@@ -58,8 +58,8 @@
 #include <linux/string.h>
 #include <linux/bitops.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
 #include <asm/irq.h>
 #include <linux/delay.h>
 #include <linux/errno.h>