From adaff63865bbe3d32c16046543239088cdb330cc Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Tue, 8 May 2007 00:48:02 -0500
Subject: [PATCH] --- yaml --- r: 55125 b: refs/heads/master c:
 a5fd22ebc71eecb7b61e542d34ac50a417b3031b h: refs/heads/master i:   55123:
 8528f225a57a37503433b20f308a1b8f560837b5 v: v3

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

diff --git a/[refs] b/[refs]
index 639971e29259..0223594b86f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb6e9590792834f905a92e439a083254649c985c
+refs/heads/master: a5fd22ebc71eecb7b61e542d34ac50a417b3031b
diff --git a/trunk/drivers/net/pasemi_mac.c b/trunk/drivers/net/pasemi_mac.c
index 78b127c404e9..b8f976bd60fd 100644
--- a/trunk/drivers/net/pasemi_mac.c
+++ b/trunk/drivers/net/pasemi_mac.c
@@ -94,7 +94,12 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac)
 		return -ENOENT;
 	}
 
-	maddr = get_property(dn, "mac-address", NULL);
+	maddr = get_property(dn, "local-mac-address", NULL);
+
+	/* Fall back to mac-address for older firmware */
+	if (maddr == NULL)
+		maddr = get_property(dn, "mac-address", NULL);
+
 	if (maddr == NULL) {
 		dev_warn(&pdev->dev,
 			 "no mac address in device tree, not configuring\n");