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/misc/kxtj9.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/misc/kxtj9.c')
| -rw-r--r-- | drivers/input/misc/kxtj9.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/misc/kxtj9.c b/drivers/input/misc/kxtj9.c index d708478bc5b5..6e29349da537 100644 --- a/drivers/input/misc/kxtj9.c +++ b/drivers/input/misc/kxtj9.c @@ -615,8 +615,7 @@ static int kxtj9_remove(struct i2c_client *client) return 0; } -#ifdef CONFIG_PM_SLEEP -static int kxtj9_suspend(struct device *dev) +static int __maybe_unused kxtj9_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); struct kxtj9_data *tj9 = i2c_get_clientdata(client); @@ -631,7 +630,7 @@ static int kxtj9_suspend(struct device *dev) return 0; } -static int kxtj9_resume(struct device *dev) +static int __maybe_unused kxtj9_resume(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); struct kxtj9_data *tj9 = i2c_get_clientdata(client); @@ -646,7 +645,6 @@ static int kxtj9_resume(struct device *dev) mutex_unlock(&input_dev->mutex); return retval; } -#endif static SIMPLE_DEV_PM_OPS(kxtj9_pm_ops, kxtj9_suspend, kxtj9_resume); |