diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-15 23:32:42 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-15 23:32:42 -0500 |
| commit | f20c86cd75f1c8c728dafd0218645ff3c5e8545d (patch) | |
| tree | b9100463df79eeafbef87a0bbbaaba4740313120 /drivers/input/misc/sirfsoc-onkey.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/sirfsoc-onkey.c')
| -rw-r--r-- | drivers/input/misc/sirfsoc-onkey.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/misc/sirfsoc-onkey.c b/drivers/input/misc/sirfsoc-onkey.c index fed5102e1802..151f169afb7f 100644 --- a/drivers/input/misc/sirfsoc-onkey.c +++ b/drivers/input/misc/sirfsoc-onkey.c | |||
| @@ -179,8 +179,7 @@ static int sirfsoc_pwrc_remove(struct platform_device *pdev) | |||
| 179 | return 0; | 179 | return 0; |
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | #ifdef CONFIG_PM_SLEEP | 182 | static int __maybe_unused sirfsoc_pwrc_resume(struct device *dev) |
| 183 | static int sirfsoc_pwrc_resume(struct device *dev) | ||
| 184 | { | 183 | { |
| 185 | struct sirfsoc_pwrc_drvdata *pwrcdrv = dev_get_drvdata(dev); | 184 | struct sirfsoc_pwrc_drvdata *pwrcdrv = dev_get_drvdata(dev); |
| 186 | struct input_dev *input = pwrcdrv->input; | 185 | struct input_dev *input = pwrcdrv->input; |
| @@ -196,7 +195,6 @@ static int sirfsoc_pwrc_resume(struct device *dev) | |||
| 196 | 195 | ||
| 197 | return 0; | 196 | return 0; |
| 198 | } | 197 | } |
| 199 | #endif | ||
| 200 | 198 | ||
| 201 | static SIMPLE_DEV_PM_OPS(sirfsoc_pwrc_pm_ops, NULL, sirfsoc_pwrc_resume); | 199 | static SIMPLE_DEV_PM_OPS(sirfsoc_pwrc_pm_ops, NULL, sirfsoc_pwrc_resume); |
| 202 | 200 | ||