From 11cf40cac38ca6ac54a5af7874556ba80a4baa10 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 23 Sep 2006 01:32:40 +0100
Subject: [PATCH] --- yaml --- r: 36510 b: refs/heads/master c:
 0c5649af3accc7f2941c5eebcc613e1a81b03448 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8032add493c9..1d7961924d50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee705dba75c2f7daae5403ad4599b6738e2da7a0
+refs/heads/master: 0c5649af3accc7f2941c5eebcc613e1a81b03448
diff --git a/trunk/drivers/net/e1000/e1000_hw.h b/trunk/drivers/net/e1000/e1000_hw.h
index a170e96251f6..4020acb55005 100644
--- a/trunk/drivers/net/e1000/e1000_hw.h
+++ b/trunk/drivers/net/e1000/e1000_hw.h
@@ -1367,8 +1367,8 @@ struct e1000_hw_stats {
 
 /* Structure containing variables used by the shared code (e1000_hw.c) */
 struct e1000_hw {
-    uint8_t *hw_addr;
-    uint8_t *flash_address;
+    uint8_t __iomem *hw_addr;
+    uint8_t __iomem *flash_address;
     e1000_mac_type mac_type;
     e1000_phy_type phy_type;
     uint32_t phy_init_script;