From 37b8899edb498e1dd96f3fc33e68fd05b0fafa70 Mon Sep 17 00:00:00 2001
From: Jingoo Han <jg1.han@samsung.com>
Date: Mon, 11 Mar 2013 11:14:41 +0900
Subject: [PATCH] --- yaml --- r: 373583 b: refs/heads/master c:
 29258b215af83dbb4ad143cefe7a1e5d0384a605 h: refs/heads/master i:   373581:
 53bcb8a50f0be165d1d815707cdae8db4426bd77   373579:
 3aa070eceb8e4e3ecc11fdc697fbee3b9d2e7cbb   373575:
 65629fa683a6c92da995d26e190e8326b919c58d   373567:
 e9d709dc7ce4a72ab4c193b008e68829992c54cd v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/pwm/pwm-tiehrpwm.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 76a98b62fbcb..c8a747abb8e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c26e9bb4ac72312386dc8ffa4dc8c1b560d9b29b
+refs/heads/master: 29258b215af83dbb4ad143cefe7a1e5d0384a605
diff --git a/trunk/drivers/pwm/pwm-tiehrpwm.c b/trunk/drivers/pwm/pwm-tiehrpwm.c
index 8b4c86fa99c8..d058ba90845b 100644
--- a/trunk/drivers/pwm/pwm-tiehrpwm.c
+++ b/trunk/drivers/pwm/pwm-tiehrpwm.c
@@ -559,6 +559,7 @@ void ehrpwm_pwm_restore_context(struct ehrpwm_pwm_chip *pc)
 	ehrpwm_write(pc->mmio_base, TBCTL, pc->ctx.tbctl);
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int ehrpwm_pwm_suspend(struct device *dev)
 {
 	struct ehrpwm_pwm_chip *pc = dev_get_drvdata(dev);
@@ -594,6 +595,7 @@ static int ehrpwm_pwm_resume(struct device *dev)
 	ehrpwm_pwm_restore_context(pc);
 	return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(ehrpwm_pwm_pm_ops, ehrpwm_pwm_suspend,
 		ehrpwm_pwm_resume);