From a299cc9ae77fb38e8d4753d1e095229f8afd4ae7 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Mon, 11 Mar 2013 11:14:16 +0900 Subject: [PATCH] --- yaml --- r: 373582 b: refs/heads/master c: c26e9bb4ac72312386dc8ffa4dc8c1b560d9b29b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pwm/pwm-tipwmss.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 62bd0b6cc628..76a98b62fbcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b78f5fc92a836259b69d49129c6c1cad9b03c322 +refs/heads/master: c26e9bb4ac72312386dc8ffa4dc8c1b560d9b29b diff --git a/trunk/drivers/pwm/pwm-tipwmss.c b/trunk/drivers/pwm/pwm-tipwmss.c index 17cbc59660ec..c9c3d3a1e0eb 100644 --- a/trunk/drivers/pwm/pwm-tipwmss.c +++ b/trunk/drivers/pwm/pwm-tipwmss.c @@ -101,6 +101,7 @@ static int pwmss_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_SLEEP static int pwmss_suspend(struct device *dev) { struct pwmss_info *info = dev_get_drvdata(dev); @@ -118,6 +119,7 @@ static int pwmss_resume(struct device *dev) writew(info->pwmss_clkconfig, info->mmio_base + PWMSS_CLKCONFIG); return 0; } +#endif static SIMPLE_DEV_PM_OPS(pwmss_pm_ops, pwmss_suspend, pwmss_resume);