From 458414b2e3d9dd7ee4510d18c119a7ccd3b43ec5 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 9 Nov 2007 16:56:10 -0600 Subject: 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 Signed-off-by: John W. Linville --- drivers/net/b44.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers') diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 3d247f3f4a3c..49e91728a1d9 100644 --- a/drivers/net/b44.c +++ b/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); -- cgit v1.2.3