From 7f7d60733d322b78fd08e1a80cc764621635c200 Mon Sep 17 00:00:00 2001 From: "viro@ftp.linux.org.uk" Date: Mon, 5 Sep 2005 03:25:53 +0100 Subject: [PATCH] --- yaml --- r: 7262 b: refs/heads/master c: 1bea9add7391be9d83886530a610fd0694f93130 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 718fc0a1db54..e49308ff04f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91fb4c964c606e63ce0d0d31814728d62a5de9bc +refs/heads/master: 1bea9add7391be9d83886530a610fd0694f93130 diff --git a/trunk/drivers/net/e1000/e1000_hw.h b/trunk/drivers/net/e1000/e1000_hw.h index 93e9f8788751..51c2b3a18b6f 100644 --- a/trunk/drivers/net/e1000/e1000_hw.h +++ b/trunk/drivers/net/e1000/e1000_hw.h @@ -1270,7 +1270,7 @@ struct e1000_hw_stats { /* Structure containing variables used by the shared code (e1000_hw.c) */ struct e1000_hw { - uint8_t *hw_addr; + uint8_t __iomem *hw_addr; uint8_t *flash_address; e1000_mac_type mac_type; e1000_phy_type phy_type;