diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-09-22 20:32:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-25 20:08:10 -0400 |
| commit | 0c5649af3accc7f2941c5eebcc613e1a81b03448 (patch) | |
| tree | 6de49be3a8712d7b20f58c364468a263080a848f | |
| parent | ee705dba75c2f7daae5403ad4599b6738e2da7a0 (diff) | |
[PATCH] restore __iomem annotations in e1000
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/net/e1000/e1000_hw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index a170e96251f6..4020acb55005 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h | |||
| @@ -1367,8 +1367,8 @@ struct e1000_hw_stats { | |||
| 1367 | 1367 | ||
| 1368 | /* Structure containing variables used by the shared code (e1000_hw.c) */ | 1368 | /* Structure containing variables used by the shared code (e1000_hw.c) */ |
| 1369 | struct e1000_hw { | 1369 | struct e1000_hw { |
| 1370 | uint8_t *hw_addr; | 1370 | uint8_t __iomem *hw_addr; |
| 1371 | uint8_t *flash_address; | 1371 | uint8_t __iomem *flash_address; |
| 1372 | e1000_mac_type mac_type; | 1372 | e1000_mac_type mac_type; |
| 1373 | e1000_phy_type phy_type; | 1373 | e1000_phy_type phy_type; |
| 1374 | uint32_t phy_init_script; | 1374 | uint32_t phy_init_script; |