commit 458414b2e3d9dd7ee4510d18c119a7ccd3b43ec5
author Larry Finger <Larry.Finger@lwfinger.net> Fri Nov 09 16:56:10 2007 -0600
committer David S. Miller <davem@davemloft.net> Mon Jan 28 15:04:42 2008 -0800
tree 5080be9ae0e46f26b7803c874c1de769d0e68ef0
parent c272ef4403c271799a7f09a4ab7a236c86643843

b44: Convert to use of the new SPROM structure

The b44 driver is changed to use the new SPROM data structure.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

drivers/net/b44.c

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 3d247f3..49e9172 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -2060,11 +2060,11 @@
 
 	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);