From c29bdb86bda10dc0e34f07f56de10a9e337048cf Mon Sep 17 00:00:00 2001
From: Bryan Wu <cooloney@kernel.org>
Date: Mon, 17 Mar 2008 14:18:31 -0700
Subject: [PATCH] --- yaml --- r: 87819 b: refs/heads/master c:
 9e6db60825ef7e7999abc610ce256ba768e58162 h: refs/heads/master i:   87817:
 b0511710a9d49134247973b6ac92c674f357a466   87815:
 4790aae240b47c8ef8eac8b476426a060b8f4097 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/smc91x.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2fc6c53b60c8..b8407fd85ed3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7793ace780942831f9b2b2b0518e810ecbd4d6f
+refs/heads/master: 9e6db60825ef7e7999abc610ce256ba768e58162
diff --git a/trunk/drivers/net/smc91x.h b/trunk/drivers/net/smc91x.h
index 51d4134b37b1..98a832a75539 100644
--- a/trunk/drivers/net/smc91x.h
+++ b/trunk/drivers/net/smc91x.h
@@ -92,14 +92,14 @@
 #define SMC_insw(a, r, p, l) 	insw ((unsigned long *)((a) + (r)), p, l)
 # endif
 /* check if the mac in reg is valid */
-#define SMC_GET_MAC_ADDR(addr)					\
+#define SMC_GET_MAC_ADDR(lp, addr)				\
 	do {							\
 		unsigned int __v;				\
-		__v = SMC_inw(ioaddr, ADDR0_REG);		\
+		__v = SMC_inw(ioaddr, ADDR0_REG(lp));		\
 		addr[0] = __v; addr[1] = __v >> 8;		\
-		__v = SMC_inw(ioaddr, ADDR1_REG);		\
+		__v = SMC_inw(ioaddr, ADDR1_REG(lp));		\
 		addr[2] = __v; addr[3] = __v >> 8;		\
-		__v = SMC_inw(ioaddr, ADDR2_REG);		\
+		__v = SMC_inw(ioaddr, ADDR2_REG(lp));		\
 		addr[4] = __v; addr[5] = __v >> 8;		\
 		if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) {		\
 			random_ether_addr(addr);		\