Skip to contentSkip to conversation

net: sh_eth: Fix compile error sh_eth

PATCH Applied Nobuhiro Iwamatsu 2 participants 2 messages Jun 18, 2008 – Jun 27, 2008

Subsystems (3)
Networking Network drivers SuperH
lore
Share & tools
lore

Nobuhiro Iwamatsu

author
#0 lore raw

PATCH 1/1 net: sh_eth: Fix compile error sh_eth

Fix compile error on sh_eth and remove base address macro.

Signed-off-by Nobuhiro Iwamatsu <[email protected]>
---
 drivers/net/sh_eth.c |    4 ++--
 drivers/net/sh_eth.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/sh_eth.c +2 -2
index f64d987..37f3116 100644
@@ -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);
drivers/net/sh_eth.h +2 -2
index ca2db6b..e01e1c3 100644
@@ -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
Signature · 1 line
1.5.5.1
Applied
#1 lore raw
Quoted 7 lines · Nobuhiro Iwamatsu

Fix compile error on sh_eth and remove base address macro.

Signed-off-by Nobuhiro Iwamatsu <[email protected]>
---
 drivers/net/sh_eth.c |    4 ++--
 drivers/net/sh_eth.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

applied