From e72dd03a68a84c027736cb7083b38fec1d75e62d Mon Sep 17 00:00:00 2001
From: Jingoo Han <jg1.han@samsung.com>
Date: Tue, 19 Mar 2013 01:28:56 +0000
Subject: [PATCH] --- yaml --- r: 364764 b: refs/heads/master c:
 4895a2ee5d1bc88d9876c4082062c1cb3df5cdd4 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/usb/gadget/mv_u3d_core.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2388e42aa847..12e197380af8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54485116cd77b361864c17c40c3280b97b6fbecc
+refs/heads/master: 4895a2ee5d1bc88d9876c4082062c1cb3df5cdd4
diff --git a/trunk/drivers/usb/gadget/mv_u3d_core.c b/trunk/drivers/usb/gadget/mv_u3d_core.c
index e91281d2aa21..49f9da462f00 100644
--- a/trunk/drivers/usb/gadget/mv_u3d_core.c
+++ b/trunk/drivers/usb/gadget/mv_u3d_core.c
@@ -2002,7 +2002,7 @@ static int mv_u3d_probe(struct platform_device *dev)
 	return retval;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int mv_u3d_suspend(struct device *dev)
 {
 	struct mv_u3d *u3d = dev_get_drvdata(dev);
@@ -2045,10 +2045,10 @@ static int mv_u3d_resume(struct device *dev)
 
 	return 0;
 }
-
-SIMPLE_DEV_PM_OPS(mv_u3d_pm_ops, mv_u3d_suspend, mv_u3d_resume);
 #endif
 
+static SIMPLE_DEV_PM_OPS(mv_u3d_pm_ops, mv_u3d_suspend, mv_u3d_resume);
+
 static void mv_u3d_shutdown(struct platform_device *dev)
 {
 	struct mv_u3d *u3d = dev_get_drvdata(&dev->dev);
@@ -2066,9 +2066,7 @@ static struct platform_driver mv_u3d_driver = {
 	.driver		= {
 		.owner	= THIS_MODULE,
 		.name	= "mv-u3d",
-#ifdef CONFIG_PM
 		.pm	= &mv_u3d_pm_ops,
-#endif
 	},
 };