From c6762d87a33098128c4af71199ab153668cd9e09 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 22 Jun 2011 20:38:58 +0000
Subject: [PATCH] --- yaml --- r: 255935 b: refs/heads/master c:
 5aedcf50e547e37b89d105efc4a2f0f1b0217af4 h: refs/heads/master i:   255933:
 fd091ad974f3f492e1d5e7b127690a64ee56776e   255931:
 a58e4cb7e61049b8d94e0ad5b63eb68fc5df2dfa   255927:
 9fdf993cb4956ce3d7b4b21e8006e1d22f8d8363   255919:
 e53b9281547c152bcc327c27142c40e5ab6f08d4   255903:
 6c36b817c685e52eb52641c5e69188a6e5b6ed4e   255871:
 59b42c0e09c7f59cffe967e325c951e02744e2f3 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/lib8390.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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>