diff options
author | Dmitry Torokhov | 2014-12-16 05:32:42 +0100 |
---|---|---|
committer | Dmitry Torokhov | 2014-12-16 05:32:42 +0100 |
commit | f20c86cd75f1c8c728dafd0218645ff3c5e8545d (patch) | |
tree | b9100463df79eeafbef87a0bbbaaba4740313120 /drivers/input/touchscreen/cyttsp_core.c | |
parent | Input: xpad - use proper endpoint type (diff) | |
parent | Input: gpio_keys - fix warning regarding uninitialized 'button' variable (diff) | |
download | kernel-qcow2-linux-f20c86cd75f1c8c728dafd0218645ff3c5e8545d.tar.gz kernel-qcow2-linux-f20c86cd75f1c8c728dafd0218645ff3c5e8545d.tar.xz kernel-qcow2-linux-f20c86cd75f1c8c728dafd0218645ff3c5e8545d.zip |
Merge branch 'next' into for-linus
Prepare input updates for 3.19.
Diffstat (limited to 'drivers/input/touchscreen/cyttsp_core.c')
-rw-r--r-- | drivers/input/touchscreen/cyttsp_core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/input/touchscreen/cyttsp_core.c b/drivers/input/touchscreen/cyttsp_core.c index eee656f77a2e..5b74e8b84e79 100644 --- a/drivers/input/touchscreen/cyttsp_core.c +++ b/drivers/input/touchscreen/cyttsp_core.c @@ -472,8 +472,7 @@ static int cyttsp_disable(struct cyttsp *ts) return 0; } -#ifdef CONFIG_PM_SLEEP -static int cyttsp_suspend(struct device *dev) +static int __maybe_unused cyttsp_suspend(struct device *dev) { struct cyttsp *ts = dev_get_drvdata(dev); int retval = 0; @@ -491,7 +490,7 @@ static int cyttsp_suspend(struct device *dev) return retval; } -static int cyttsp_resume(struct device *dev) +static int __maybe_unused cyttsp_resume(struct device *dev) { struct cyttsp *ts = dev_get_drvdata(dev); @@ -507,8 +506,6 @@ static int cyttsp_resume(struct device *dev) return 0; } -#endif - SIMPLE_DEV_PM_OPS(cyttsp_pm_ops, cyttsp_suspend, cyttsp_resume); EXPORT_SYMBOL_GPL(cyttsp_pm_ops); |