From 3b47f332e6765484c86603ecdf0ee7b8568ccd99 Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Date: Mon, 17 Nov 2008 20:29:58 +0000
Subject: [PATCH] --- yaml --- r: 119247 b: refs/heads/master c:
 fb5e2f9b9410a4362897d12dc1ed4f7cec1b0d45 h: refs/heads/master i:   119245:
 6174208b6cb03ff4fb64653472d779f4da3063d6   119243:
 44a60f83e1ac9e4ef8f1bb1ca8dacc76d26caf8d   119239:
 dd243df0dae4fa0072bf10e3df5a16196b792575   119231:
 d6869e39de47da6665061a369e24bc74380eac97 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/sh_eth.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index de9e0cd00c70..35c4100d54a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c82838458200ec4167ce7083b0a17474150c5bf7
+refs/heads/master: fb5e2f9b9410a4362897d12dc1ed4f7cec1b0d45
diff --git a/trunk/drivers/net/sh_eth.c b/trunk/drivers/net/sh_eth.c
index a24bb68887ab..59f242a67714 100644
--- a/trunk/drivers/net/sh_eth.c
+++ b/trunk/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);