diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-09-24 20:40:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 20:40:52 -0400 |
| commit | ae19161e28a7b48d2752eff3ac8eb7703986c313 (patch) | |
| tree | 0d174e0ef02b0e21951dd40df6ebbfc320d11732 /arch/powerpc | |
| parent | 152cbcf94baec68b45832db5024184906ab798b1 (diff) | |
| parent | 042af53c7839282de15cc7fd7ad8ab938d74ab7c (diff) | |
Merge branch 'for-2.6.28' of git://git.marvell.com/mv643xx_eth into upstream-next
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/sysdev/mv64x60_dev.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c index 32e0ad0ebea8..b6bd775d2e22 100644 --- a/arch/powerpc/sysdev/mv64x60_dev.c +++ b/arch/powerpc/sysdev/mv64x60_dev.c | |||
| @@ -293,10 +293,8 @@ static int __init mv64x60_eth_device_setup(struct device_node *np, int id, | |||
| 293 | return -ENODEV; | 293 | return -ENODEV; |
| 294 | 294 | ||
| 295 | prop = of_get_property(phy, "reg", NULL); | 295 | prop = of_get_property(phy, "reg", NULL); |
| 296 | if (prop) { | 296 | if (prop) |
| 297 | pdata.force_phy_addr = 1; | 297 | pdata.phy_addr = MV643XX_ETH_PHY_ADDR(*prop); |
| 298 | pdata.phy_addr = *prop; | ||
| 299 | } | ||
| 300 | 298 | ||
| 301 | of_node_put(phy); | 299 | of_node_put(phy); |
| 302 | 300 | ||