From ed9124800e87925f58429ab6b0be5f55e8146ee8 Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Mon, 28 Feb 2011 04:05:25 +0000
Subject: [PATCH] --- yaml --- r: 233835 b: refs/heads/master c:
 915239472a5015c7667025551a73e11d6e2abee0 h: refs/heads/master i:   233833:
 931df9b3336fcda2cc04ef26855d613936fc93c1   233831:
 992b87a9e709c9358aa6c13235424683348b9d1a v: v3

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

diff --git a/[refs] b/[refs]
index 87941c16332c..748aa6bc6912 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b44d211e166b4b0dae8ce379f9d2e3ac164b5b60
+refs/heads/master: 915239472a5015c7667025551a73e11d6e2abee0
diff --git a/trunk/drivers/net/macb.c b/trunk/drivers/net/macb.c
index f69e73e2191e..79ccb54ab00c 100644
--- a/trunk/drivers/net/macb.c
+++ b/trunk/drivers/net/macb.c
@@ -260,7 +260,7 @@ static int macb_mii_init(struct macb *bp)
 	for (i = 0; i < PHY_MAX_ADDR; i++)
 		bp->mii_bus->irq[i] = PHY_POLL;
 
-	platform_set_drvdata(bp->dev, bp->mii_bus);
+	dev_set_drvdata(&bp->dev->dev, bp->mii_bus);
 
 	if (mdiobus_register(bp->mii_bus))
 		goto err_out_free_mdio_irq;