diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/pasemi_mac.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index 78b127c404e9..b8f976bd60fd 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c | |||
@@ -94,7 +94,12 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac) | |||
94 | return -ENOENT; | 94 | return -ENOENT; |
95 | } | 95 | } |
96 | 96 | ||
97 | maddr = get_property(dn, "mac-address", NULL); | 97 | maddr = get_property(dn, "local-mac-address", NULL); |
98 | |||
99 | /* Fall back to mac-address for older firmware */ | ||
100 | if (maddr == NULL) | ||
101 | maddr = get_property(dn, "mac-address", NULL); | ||
102 | |||
98 | if (maddr == NULL) { | 103 | if (maddr == NULL) { |
99 | dev_warn(&pdev->dev, | 104 | dev_warn(&pdev->dev, |
100 | "no mac address in device tree, not configuring\n"); | 105 | "no mac address in device tree, not configuring\n"); |