diff --git a/[refs] b/[refs] index cdc5997fd583..77c1e05f4d1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44388c7ead4b2bae9f82bc0862475640c50f357d +refs/heads/master: ab1a145638addee40587daf12c98ec6a30029f0a diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 3c08db41cec4..76038bbeb50e 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -288,8 +288,6 @@ static void sky2_gmac_reset(struct sky2_hw *hw, unsigned port) /* disable all GMAC IRQ's */ sky2_write8(hw, SK_REG(port, GMAC_IRQ_MSK), 0); - /* disable PHY IRQs */ - gm_phy_write(hw, port, PHY_MARV_INT_MASK, 0); gma_write16(hw, port, GM_MC_ADDR_H1, 0); /* clear MC hash */ gma_write16(hw, port, GM_MC_ADDR_H2, 0);