From 24fb892cf6a9e48457636899ad015956df5bd495 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Wed, 27 Jun 2012 03:45:22 +0000
Subject: [PATCH] --- yaml --- r: 314682 b: refs/heads/master c:
 119fc007766fc6ec6cff0f696d73cebb6f2cbe58 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 03f82df98588..1cf5a26e5622 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fa9c0fe3ec0a008352d4a4fb8d972a437183404
+refs/heads/master: 119fc007766fc6ec6cff0f696d73cebb6f2cbe58
diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec.c
index 4dce9e3ac83a..f174070646f5 100644
--- a/trunk/drivers/net/ethernet/freescale/fec.c
+++ b/trunk/drivers/net/ethernet/freescale/fec.c
@@ -1513,7 +1513,8 @@ static void __devinit fec_reset_phy(struct platform_device *pdev)
 		return;
 
 	phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0);
-	err = gpio_request_one(phy_reset, GPIOF_OUT_INIT_LOW, "phy-reset");
+	err = devm_gpio_request_one(&pdev->dev, phy_reset,
+				    GPIOF_OUT_INIT_LOW, "phy-reset");
 	if (err) {
 		pr_debug("FEC: failed to get gpio phy-reset: %d\n", err);
 		return;