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/ad714x-i2c.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/ad714x-i2c.c')
| -rw-r--r-- | drivers/input/misc/ad714x-i2c.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/misc/ad714x-i2c.c b/drivers/input/misc/ad714x-i2c.c index e0f522516ef5..189bdc8e91a5 100644 --- a/drivers/input/misc/ad714x-i2c.c +++ b/drivers/input/misc/ad714x-i2c.c @@ -13,17 +13,15 @@ #include <linux/pm.h> #include "ad714x.h" -#ifdef CONFIG_PM_SLEEP -static int ad714x_i2c_suspend(struct device *dev) +static int __maybe_unused ad714x_i2c_suspend(struct device *dev) { return ad714x_disable(i2c_get_clientdata(to_i2c_client(dev))); } -static int ad714x_i2c_resume(struct device *dev) +static int __maybe_unused ad714x_i2c_resume(struct device *dev) { return ad714x_enable(i2c_get_clientdata(to_i2c_client(dev))); } -#endif static SIMPLE_DEV_PM_OPS(ad714x_i2c_pm, ad714x_i2c_suspend, ad714x_i2c_resume); |