mv643xx_eth: remove force_phy_addr field

[linux-2.6-omap-h63xx.git] / drivers / net / mv643xx_eth.c

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 6d3da78b7ad547b652adea7daffd4726922640b0..b4850cf2a8ce096fdc9855e7fde6decf9dd20a19 100644 (file)
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2412,10 +2412,10 @@ static void set_params(struct mv643xx_eth_private *mp,
        else
                uc_addr_get(mp, dev->dev_addr);
 
-       if (pd->phy_addr == -1) {
+       if (pd->phy_addr == MV643XX_ETH_PHY_NONE) {
                mp->phy_addr = -1;
        } else {
-               if (pd->force_phy_addr || pd->phy_addr) {
+               if (pd->phy_addr != MV643XX_ETH_PHY_ADDR_DEFAULT) {
                        mp->phy_addr = pd->phy_addr & 0x3f;
                        phy_addr_set(mp, mp->phy_addr);
                } else {