diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-15 20:32:42 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-15 20:32:42 -0800 |
commit | f20c86cd75f1c8c728dafd0218645ff3c5e8545d (patch) | |
tree | b9100463df79eeafbef87a0bbbaaba4740313120 /drivers/input/misc/twl4030-vibra.c | |
parent | a1f9a4072655843fc03186acbad65990cc05dd2d (diff) | |
parent | 1d6a01365fd63fbf7c2709a183e2936728c8efad (diff) |
Merge branch 'next' into for-linus
Prepare input updates for 3.19.
Diffstat (limited to 'drivers/input/misc/twl4030-vibra.c')
-rw-r--r-- | drivers/input/misc/twl4030-vibra.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c index 960ef2a70910..c802c4af480c 100644 --- a/drivers/input/misc/twl4030-vibra.c +++ b/drivers/input/misc/twl4030-vibra.c @@ -157,8 +157,7 @@ static void twl4030_vibra_close(struct input_dev *input) } /*** Module ***/ -#ifdef CONFIG_PM_SLEEP -static int twl4030_vibra_suspend(struct device *dev) +static int __maybe_unused twl4030_vibra_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct vibra_info *info = platform_get_drvdata(pdev); @@ -169,12 +168,11 @@ static int twl4030_vibra_suspend(struct device *dev) return 0; } -static int twl4030_vibra_resume(struct device *dev) +static int __maybe_unused twl4030_vibra_resume(struct device *dev) { vibra_disable_leds(); return 0; } -#endif static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops, twl4030_vibra_suspend, twl4030_vibra_resume); |