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/ipaq-micro-ts.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/ipaq-micro-ts.c')
-rw-r--r-- | drivers/input/touchscreen/ipaq-micro-ts.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/ipaq-micro-ts.c b/drivers/input/touchscreen/ipaq-micro-ts.c index 62c8976e616f..33c134820ef9 100644 --- a/drivers/input/touchscreen/ipaq-micro-ts.c +++ b/drivers/input/touchscreen/ipaq-micro-ts.c @@ -122,8 +122,7 @@ static int micro_ts_probe(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int micro_ts_suspend(struct device *dev) +static int __maybe_unused micro_ts_suspend(struct device *dev) { struct touchscreen_data *ts = dev_get_drvdata(dev); @@ -132,7 +131,7 @@ static int micro_ts_suspend(struct device *dev) return 0; } -static int micro_ts_resume(struct device *dev) +static int __maybe_unused micro_ts_resume(struct device *dev) { struct touchscreen_data *ts = dev_get_drvdata(dev); struct input_dev *input = ts->input; @@ -146,7 +145,6 @@ static int micro_ts_resume(struct device *dev) return 0; } -#endif static const struct dev_pm_ops micro_ts_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(micro_ts_suspend, micro_ts_resume) |