From 4dc3125d74f3dfb5af7f365fbcb4cc5d50148ed7 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Apr 2008 13:20:08 -0700
Subject: [PATCH] --- yaml --- r: 88191 b: refs/heads/master c:
 099c736a470c8080a166e7a089f1e48e15f9947c h: refs/heads/master i:   88189:
 ad47dc06c75746fac4c8f7e819ecaddfd515a99e   88187:
 c19ed203d460b1b8024f597b08bd01e42f2710da   88183:
 b357cbff78224a7203addf28774ddc5b336e2c99   88175:
 50f9156b663916959eab3984ac991b237db48f04   88159:
 e8684f28de4c6a3ff63dadcc6d993c038e93f259   88127:
 ab9c127df96d090ca4a944f4d8ec0634416c4a5a   88063:
 6c3bac09bdab7d7df7970dac181ffd519b6b0c38 v: v3

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

diff --git a/[refs] b/[refs]
index 9c8cd4d582c4..569afb22d347 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 950b0d28378c4ee63a30dad732a8319c8a41c95d
+refs/heads/master: 099c736a470c8080a166e7a089f1e48e15f9947c
diff --git a/trunk/drivers/net/smc91x.h b/trunk/drivers/net/smc91x.h
index 98a832a75539..51d4134b37b1 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(lp, addr)				\
+#define SMC_GET_MAC_ADDR(addr)					\
 	do {							\
 		unsigned int __v;				\
-		__v = SMC_inw(ioaddr, ADDR0_REG(lp));		\
+		__v = SMC_inw(ioaddr, ADDR0_REG);		\
 		addr[0] = __v; addr[1] = __v >> 8;		\
-		__v = SMC_inw(ioaddr, ADDR1_REG(lp));		\
+		__v = SMC_inw(ioaddr, ADDR1_REG);		\
 		addr[2] = __v; addr[3] = __v >> 8;		\
-		__v = SMC_inw(ioaddr, ADDR2_REG(lp));		\
+		__v = SMC_inw(ioaddr, ADDR2_REG);		\
 		addr[4] = __v; addr[5] = __v >> 8;		\
 		if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) {		\
 			random_ether_addr(addr);		\