summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2011-02-24 17:11:42 +0100
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-03-02 12:20:56 +0100
commit2db1badfa5d100dd9f7c7a716911250a735cf2e8 (patch)
treec4be8c9587d11e79c3835ab3fa474c57a66bcd8d /drivers
parentnet: fix nla_policy_len to actually _iterate_ over the policy (diff)
downloadlinux-2db1badfa5d100dd9f7c7a716911250a735cf2e8.tar.xz
linux-2db1badfa5d100dd9f7c7a716911250a735cf2e8.zip
e1000: fix sparse warning
Sparse complains because the e1000 driver is calling ioread on a pointer not tagged as __iomem. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/e1000/e1000_osdep.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h
index 55c1711f1688..33e7c45a4fe4 100644
--- a/drivers/net/e1000/e1000_osdep.h
+++ b/drivers/net/e1000/e1000_osdep.h
@@ -42,7 +42,8 @@
#define GBE_CONFIG_RAM_BASE \
((unsigned int)(CONFIG_RAM_BASE + GBE_CONFIG_OFFSET))
-#define GBE_CONFIG_BASE_VIRT phys_to_virt(GBE_CONFIG_RAM_BASE)
+#define GBE_CONFIG_BASE_VIRT \
+ ((void __iomem *)phys_to_virt(GBE_CONFIG_RAM_BASE))
#define GBE_CONFIG_FLASH_WRITE(base, offset, count, data) \
(iowrite16_rep(base + offset, data, count))