Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

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)
         ctrl_outl((FIFO_SIZE_T | FIFO_SIZE_R), ioaddr + FDR);
         ctrl_outl(0, ioaddr + TFTR);
 
-        ctrl_outl(RMCR_RST, ioaddr + RMCR);
+        ctrl_outl(0, ioaddr + RMCR);
 
         rx_int_var = mdp->rx_int_var = DESC_I_RINT8 | DESC_I_RINT5;
         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)
         /* Hook up MII support for ethtool */
         mdp->mii_bus->name = "sh_mii";
         mdp->mii_bus->dev = &ndev->dev;
-        mdp->mii_bus->id = id;
+        mdp->mii_bus->id[0] = id;
 
         /* PHY IRQ */
         mdp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);