Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=458414b2e3d9dd7ee4510d18c119a7ccd3b43ec5
Commit:     458414b2e3d9dd7ee4510d18c119a7ccd3b43ec5
Parent:     c272ef4403c271799a7f09a4ab7a236c86643843
Author:     Larry Finger <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 9 16:56:10 2007 -0600
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:04:42 2008 -0800

    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 <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/b44.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

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 @@ 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);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to