Merge branch 'devel' into next

[sfrench/cifs-2.6.git] / drivers / net / fec_mpc52xx_phy.c

diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 45dd9bdc5d62ac0299058434aa4862ca277d8828..dd9bfa42ac348b3039c56d90dd6cab9f0c61fa50 100644 (file)
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -122,9 +122,6 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
        out_be32(&priv->regs->mii_speed,
                ((mpc52xx_find_ipb_freq(of->node) >> 20) / 5) << 1);
 
-       /* enable MII interrupt */
-       out_be32(&priv->regs->imask, in_be32(&priv->regs->imask) | FEC_IMASK_MII);
-
        err = mdiobus_register(bus);
        if (err)
                goto out_unmap;
@@ -156,7 +153,7 @@ static int mpc52xx_fec_mdio_remove(struct of_device *of)
 
        iounmap(priv->regs);
        for (i=0; i<PHY_MAX_ADDR; i++)
-               if (bus->irq[i])
+               if (bus->irq[i] != PHY_POLL)
                        irq_dispose_mapping(bus->irq[i]);
        kfree(priv);
        kfree(bus->irq);