From 45826a32a6d4bc48efc3db9a50388b9513730dd8 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <martinez.javier@gmail.com>
Date: Sat, 26 Mar 2011 16:42:31 +0000
Subject: [PATCH] --- yaml --- r: 243248 b: refs/heads/master c:
 27fd9de8eb9bf48e4a09c8f02d13f56e9a074a1e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3af1580c179e..6e79a1f27eac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e49e6d520401e1d25ec8d366520aad2c01adc1c
+refs/heads/master: 27fd9de8eb9bf48e4a09c8f02d13f56e9a074a1e
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index ebec88882c3b..513565503f90 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -48,9 +48,9 @@
 #include <net/ip.h>
 
 #include <asm/system.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #ifdef CONFIG_SPARC
 #include <asm/idprom.h>