diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-31 08:46:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-31 08:46:45 -0400 |
| commit | 64960848abd18d0bcde3f53ffa7ed0b631e6b25d (patch) | |
| tree | 8424a1c550a98ce09f127425fde9b7b5f2f5027a /drivers/net/greth.c | |
| parent | 2903037400a26e7c0cc93ab75a7d62abfacdf485 (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/greth.c')
| -rw-r--r-- | drivers/net/greth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/greth.c b/drivers/net/greth.c index fd491e409488..f37a4c143ddd 100644 --- a/drivers/net/greth.c +++ b/drivers/net/greth.c | |||
| @@ -1499,7 +1499,8 @@ static int __devinit greth_of_probe(struct of_device *ofdev, const struct of_dev | |||
| 1499 | if (i == 6) { | 1499 | if (i == 6) { |
| 1500 | const unsigned char *addr; | 1500 | const unsigned char *addr; |
| 1501 | int len; | 1501 | int len; |
| 1502 | addr = of_get_property(ofdev->node, "local-mac-address", &len); | 1502 | addr = of_get_property(ofdev->dev.of_node, "local-mac-address", |
| 1503 | &len); | ||
| 1503 | if (addr != NULL && len == 6) { | 1504 | if (addr != NULL && len == 6) { |
| 1504 | for (i = 0; i < 6; i++) | 1505 | for (i = 0; i < 6; i++) |
| 1505 | macaddr[i] = (unsigned int) addr[i]; | 1506 | macaddr[i] = (unsigned int) addr[i]; |