From c6aece37dac4010b8cec3b57f23bf73d523ec0de Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Fri, 9 Nov 2007 16:56:10 -0600
Subject: [PATCH] --- yaml --- r: 78999 b: refs/heads/master c:
 458414b2e3d9dd7ee4510d18c119a7ccd3b43ec5 h: refs/heads/master i:   78997:
 61fa1696b26dd29c3d671320970439dca1e5883f   78995:
 270d6622c276cb82d7905d9ebcb0ea17cda55a20   78991:
 5e1038ef9becceb512548f5d0141c6dbf1524330 v: v3

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

diff --git a/[refs] b/[refs]
index 68e1db9b53af..a7197c5193c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c272ef4403c271799a7f09a4ab7a236c86643843
+refs/heads/master: 458414b2e3d9dd7ee4510d18c119a7ccd3b43ec5
diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c
index 3d247f3f4a3c..49e91728a1d9 100644
--- a/trunk/drivers/net/b44.c
+++ b/trunk/drivers/net/b44.c
@@ -2060,11 +2060,11 @@ static int __devinit b44_get_invariants(struct b44 *bp)
 
 	if (sdev->bus->bustype == SSB_BUSTYPE_SSB &&
 	    instance > 1) {
-		addr = sdev->bus->sprom.r1.et1mac;
-		bp->phy_addr = sdev->bus->sprom.r1.et1phyaddr;
+		addr = sdev->bus->sprom.et1mac;
+		bp->phy_addr = sdev->bus->sprom.et1phyaddr;
 	} else {
-		addr = sdev->bus->sprom.r1.et0mac;
-		bp->phy_addr = sdev->bus->sprom.r1.et0phyaddr;
+		addr = sdev->bus->sprom.et0mac;
+		bp->phy_addr = sdev->bus->sprom.et0phyaddr;
 	}
 	memcpy(bp->dev->dev_addr, addr, 6);