From 3480f990de550a1ae7abf70bb0a79ffe11d5c311 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@mvista.com>
Date: Fri, 14 May 2010 04:27:36 +0000
Subject: [PATCH] --- yaml --- r: 195175 b: refs/heads/master c:
 b14ed884df5968b0977114ebd5a22f58d0d15315 h: refs/heads/master i:   195173:
 405886592099152129efa98772f7ce757d255b4f   195171:
 5bf13cb6c56be1af401f75149a651c5c9ea655c5   195167:
 f8f95c009902246863971664236627d710433a32 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/net/gianfar.c | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 51e1897b3b08..f8a6fca0eda9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0cd15081a72075df16c45a2310e873fb9fcd82f
+refs/heads/master: b14ed884df5968b0977114ebd5a22f58d0d15315
diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c
index 43db5ab8ba3d..c6791cd4ee05 100644
--- a/trunk/drivers/net/gianfar.c
+++ b/trunk/drivers/net/gianfar.c
@@ -1344,21 +1344,9 @@ static struct dev_pm_ops gfar_pm_ops = {
 
 #define GFAR_PM_OPS (&gfar_pm_ops)
 
-static int gfar_legacy_suspend(struct of_device *ofdev, pm_message_t state)
-{
-	return gfar_suspend(&ofdev->dev);
-}
-
-static int gfar_legacy_resume(struct of_device *ofdev)
-{
-	return gfar_resume(&ofdev->dev);
-}
-
 #else
 
 #define GFAR_PM_OPS NULL
-#define gfar_legacy_suspend NULL
-#define gfar_legacy_resume NULL
 
 #endif
 
@@ -3184,8 +3172,6 @@ static struct of_platform_driver gfar_driver = {
 
 	.probe = gfar_probe,
 	.remove = gfar_remove,
-	.suspend = gfar_legacy_suspend,
-	.resume = gfar_legacy_resume,
 	.driver.pm = GFAR_PM_OPS,
 };