From 53bcb8a50f0be165d1d815707cdae8db4426bd77 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Mon, 11 Mar 2013 11:12:58 +0900 Subject: [PATCH] --- yaml --- r: 373581 b: refs/heads/master c: b78f5fc92a836259b69d49129c6c1cad9b03c322 h: refs/heads/master i: 373579: 3aa070eceb8e4e3ecc11fdc697fbee3b9d2e7cbb v: v3 --- [refs] | 2 +- trunk/drivers/pwm/pwm-tiecap.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9116133ce4c2..62bd0b6cc628 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c509a8e521939ca1fd4ba31feca4718328044230 +refs/heads/master: b78f5fc92a836259b69d49129c6c1cad9b03c322 diff --git a/trunk/drivers/pwm/pwm-tiecap.c b/trunk/drivers/pwm/pwm-tiecap.c index 22e96e2bffd3..f024db06e6c4 100644 --- a/trunk/drivers/pwm/pwm-tiecap.c +++ b/trunk/drivers/pwm/pwm-tiecap.c @@ -311,6 +311,7 @@ void ecap_pwm_restore_context(struct ecap_pwm_chip *pc) writew(pc->ctx.ecctl2, pc->mmio_base + ECCTL2); } +#ifdef CONFIG_PM_SLEEP static int ecap_pwm_suspend(struct device *dev) { struct ecap_pwm_chip *pc = dev_get_drvdata(dev); @@ -337,6 +338,7 @@ static int ecap_pwm_resume(struct device *dev) ecap_pwm_restore_context(pc); return 0; } +#endif static SIMPLE_DEV_PM_OPS(ecap_pwm_pm_ops, ecap_pwm_suspend, ecap_pwm_resume);