From 689add9ee1c43b12afe3007076acfba05b855f2e Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 24 Feb 2012 00:51:40 -0800
Subject: [PATCH] --- yaml --- r: 288311 b: refs/heads/master c:
 f3761c0779b62276b5bf84532a81d5dc49bd721f h: refs/heads/master i:   288309:
 6a3a1a0504966c0c5e6aa1421a6e6bae19fb2053   288307:
 e109cdbf3cb653efa3c1e0298c5a66ff9aae4e5f   288303:
 bcf63a2cd45b8b56ab9ee076cd438b50748d35a8 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/input/misc/twl4030-vibra.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f1053828cd1e..becac7a8d5ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02dfc496800dfaf17b650256642f3df86653fe97
+refs/heads/master: f3761c0779b62276b5bf84532a81d5dc49bd721f
diff --git a/trunk/drivers/input/misc/twl4030-vibra.c b/trunk/drivers/input/misc/twl4030-vibra.c
index 37651373a95b..f3bc4189a7ba 100644
--- a/trunk/drivers/input/misc/twl4030-vibra.c
+++ b/trunk/drivers/input/misc/twl4030-vibra.c
@@ -172,7 +172,7 @@ static void twl4030_vibra_close(struct input_dev *input)
 }
 
 /*** Module ***/
-#if CONFIG_PM
+#if CONFIG_PM_SLEEP
 static int twl4030_vibra_suspend(struct device *dev)
 {
 	struct platform_device *pdev = to_platform_device(dev);
@@ -189,10 +189,10 @@ static int twl4030_vibra_resume(struct device *dev)
 	vibra_disable_leds();
 	return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
 			 twl4030_vibra_suspend, twl4030_vibra_resume);
-#endif
 
 static int __devinit twl4030_vibra_probe(struct platform_device *pdev)
 {
@@ -273,9 +273,7 @@ static struct platform_driver twl4030_vibra_driver = {
 	.driver		= {
 		.name	= "twl4030-vibra",
 		.owner	= THIS_MODULE,
-#ifdef CONFIG_PM
 		.pm	= &twl4030_vibra_pm_ops,
-#endif
 	},
 };
 module_platform_driver(twl4030_vibra_driver);