From f7c92394feb15a698465b46b3211b6358405b664 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Thu, 21 Oct 2010 18:05:33 +0000
Subject: [PATCH] --- yaml --- r: 218397 b: refs/heads/master c:
 81e8e5601fba4ea5bc3bfbed0fec074cf65feca5 h: refs/heads/master i:   218395:
 c1c71602bbdb567c6259af0f502a325eec73f934 v: v3

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

diff --git a/[refs] b/[refs]
index eff0757377ef..6f1e835bdeff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3843e5154cdcab15fa7405f175e9a1626030792d
+refs/heads/master: 81e8e5601fba4ea5bc3bfbed0fec074cf65feca5
diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_int.h b/trunk/drivers/net/vmxnet3/vmxnet3_int.h
index 46aee6dc8f44..8a2f4712284c 100644
--- a/trunk/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/trunk/drivers/net/vmxnet3/vmxnet3_int.h
@@ -301,8 +301,8 @@ struct vmxnet3_adapter {
 	struct net_device              *netdev;
 	struct pci_dev                 *pdev;
 
-	u8				*hw_addr0; /* for BAR 0 */
-	u8				*hw_addr1; /* for BAR 1 */
+	u8			__iomem *hw_addr0; /* for BAR 0 */
+	u8			__iomem *hw_addr1; /* for BAR 1 */
 
 	/* feature control */
 	bool				rxcsum;