From b0de9d71e0a42ede4228bf57416ea3cd0eb69744 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 18 Jun 2008 18:32:09 +0900 Subject: [PATCH] --- yaml --- r: 103115 b: refs/heads/master c: 0caa11663cbfc55209fd3ccab6afab2708bb44fd h: refs/heads/master i: 103113: e5425feb364e9d39b7ba60baa2ccb02f5b88d45d 103111: d26a9d6837e2c84d0884a2c1bc64f399d28af4fa v: v3 --- [refs] | 2 +- trunk/drivers/net/sh_eth.c | 4 ++-- trunk/drivers/net/sh_eth.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 939b9675f783..b0cb9f634b1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b45f87681e2851f0c991a589989daa6a4a351565 +refs/heads/master: 0caa11663cbfc55209fd3ccab6afab2708bb44fd diff --git a/trunk/drivers/net/sh_eth.c b/trunk/drivers/net/sh_eth.c index f64d987140a9..37f3116ea6bd 100644 --- a/trunk/drivers/net/sh_eth.c +++ b/trunk/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); diff --git a/trunk/drivers/net/sh_eth.h b/trunk/drivers/net/sh_eth.h index ca2db6bb3c61..e01e1c347715 100644 --- a/trunk/drivers/net/sh_eth.h +++ b/trunk/drivers/net/sh_eth.h @@ -40,8 +40,6 @@ #define PKT_BUF_SZ 1538 /* Chip Base Address */ -#define SH_ETH0_BASE 0xA7000000 -#define SH_ETH1_BASE 0xA7000400 #define SH_TSU_ADDR 0xA7000804 /* Chip Registers */ @@ -462,3 +460,5 @@ static void swaps(char *src, int len) *p = swab32(*p); #endif } + +#endif