Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0caa1166 authored by Nobuhiro Iwamatsu's avatar Nobuhiro Iwamatsu Committed by Jeff Garzik
Browse files

net: sh_eth: Fix compile error sh_eth 



Fix compile error on sh_eth and remove base address macro.

Signed-off-by: default avatarNobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent b45f8768

drivers/net/sh_eth.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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