diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-16 05:32:42 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-16 05:32:42 +0100 |
| commit | f20c86cd75f1c8c728dafd0218645ff3c5e8545d (patch) | |
| tree | b9100463df79eeafbef87a0bbbaaba4740313120 /drivers/input/touchscreen/ads7846.c | |
| parent | Input: xpad - use proper endpoint type (diff) | |
| parent | Input: gpio_keys - fix warning regarding uninitialized 'button' variable (diff) | |
| download | linux-f20c86cd75f1c8c728dafd0218645ff3c5e8545d.tar.xz linux-f20c86cd75f1c8c728dafd0218645ff3c5e8545d.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 3.19.
Diffstat (limited to 'drivers/input/touchscreen/ads7846.c')
| -rw-r--r-- | drivers/input/touchscreen/ads7846.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index e57ba52bf484..e4eb8a6c658f 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -883,8 +883,7 @@ static irqreturn_t ads7846_irq(int irq, void *handle) return IRQ_HANDLED; } -#ifdef CONFIG_PM_SLEEP -static int ads7846_suspend(struct device *dev) +static int __maybe_unused ads7846_suspend(struct device *dev) { struct ads7846 *ts = dev_get_drvdata(dev); @@ -906,7 +905,7 @@ static int ads7846_suspend(struct device *dev) return 0; } -static int ads7846_resume(struct device *dev) +static int __maybe_unused ads7846_resume(struct device *dev) { struct ads7846 *ts = dev_get_drvdata(dev); @@ -927,7 +926,6 @@ static int ads7846_resume(struct device *dev) return 0; } -#endif static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume); |