diff options
| author | Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> | 2008-11-17 20:29:58 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-20 01:28:30 -0800 |
| commit | fb5e2f9b9410a4362897d12dc1ed4f7cec1b0d45 (patch) | |
| tree | cccf02d39ed085648ff812e92b723220f99156b7 /drivers/net/sh_eth.c | |
| parent | c82838458200ec4167ce7083b0a17474150c5bf7 (diff) | |
| download | blackbird-op-linux-fb5e2f9b9410a4362897d12dc1ed4f7cec1b0d45.tar.gz blackbird-op-linux-fb5e2f9b9410a4362897d12dc1ed4f7cec1b0d45.zip | |
sh: sh_eth: Update to change of mii_bus
Update to change of mii_bus interface and fix some warning.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sh_eth.c')
| -rw-r--r-- | drivers/net/sh_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index a24bb68887ab..59f242a67714 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -927,7 +927,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) struct sh_eth_private *mdp = netdev_priv(ndev); struct sh_eth_txdesc *txdesc; u32 entry; - int flags; + unsigned long flags; spin_lock_irqsave(&mdp->lock, flags); if ((mdp->cur_tx - mdp->dirty_tx) >= (TX_RING_SIZE - 4)) { @@ -1141,7 +1141,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->parent = &ndev->dev; - mdp->mii_bus->id[0] = id; + snprintf(mdp->mii_bus->id, MII_BUS_ID_SIZE, "%x", id); /* PHY IRQ */ mdp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL); |
