diff options
Diffstat (limited to 'drivers/net/sh_eth.c')
-rw-r--r-- | drivers/net/sh_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index f64d987140a9..37f3116ea6bd 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c | |||
@@ -322,7 +322,7 @@ static int sh_eth_dev_init(struct net_device *ndev) | |||
322 | ctrl_outl((FIFO_SIZE_T | FIFO_SIZE_R), ioaddr + FDR); | 322 | ctrl_outl((FIFO_SIZE_T | FIFO_SIZE_R), ioaddr + FDR); |
323 | ctrl_outl(0, ioaddr + TFTR); | 323 | ctrl_outl(0, ioaddr + TFTR); |
324 | 324 | ||
325 | ctrl_outl(RMCR_RST, ioaddr + RMCR); | 325 | ctrl_outl(0, ioaddr + RMCR); |
326 | 326 | ||
327 | rx_int_var = mdp->rx_int_var = DESC_I_RINT8 | DESC_I_RINT5; | 327 | rx_int_var = mdp->rx_int_var = DESC_I_RINT8 | DESC_I_RINT5; |
328 | tx_int_var = mdp->tx_int_var = DESC_I_TINT2; | 328 | tx_int_var = mdp->tx_int_var = DESC_I_TINT2; |
@@ -994,7 +994,7 @@ static int sh_mdio_init(struct net_device *ndev, int id) | |||
994 | /* Hook up MII support for ethtool */ | 994 | /* Hook up MII support for ethtool */ |
995 | mdp->mii_bus->name = "sh_mii"; | 995 | mdp->mii_bus->name = "sh_mii"; |
996 | mdp->mii_bus->dev = &ndev->dev; | 996 | mdp->mii_bus->dev = &ndev->dev; |
997 | mdp->mii_bus->id = id; | 997 | mdp->mii_bus->id[0] = id; |
998 | 998 | ||
999 | /* PHY IRQ */ | 999 | /* PHY IRQ */ |
1000 | mdp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL); | 1000 | mdp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL); |