diff options
-rw-r--r-- | drivers/net/sh_eth.c | 4 | ||||
-rw-r--r-- | drivers/net/sh_eth.h | 4 |
2 files changed, 4 insertions, 4 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); |
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index ca2db6bb3c61..e01e1c347715 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h | |||
@@ -40,8 +40,6 @@ | |||
40 | #define PKT_BUF_SZ 1538 | 40 | #define PKT_BUF_SZ 1538 |
41 | 41 | ||
42 | /* Chip Base Address */ | 42 | /* Chip Base Address */ |
43 | #define SH_ETH0_BASE 0xA7000000 | ||
44 | #define SH_ETH1_BASE 0xA7000400 | ||
45 | #define SH_TSU_ADDR 0xA7000804 | 43 | #define SH_TSU_ADDR 0xA7000804 |
46 | 44 | ||
47 | /* Chip Registers */ | 45 | /* Chip Registers */ |
@@ -462,3 +460,5 @@ static void swaps(char *src, int len) | |||
462 | *p = swab32(*p); | 460 | *p = swab32(*p); |
463 | #endif | 461 | #endif |
464 | } | 462 | } |
463 | |||
464 | #endif | ||