summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-08-05 09:04:18 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-08-12 22:32:14 -0700
commit1bc754579ff17288d7dc69d2c3e38e4e6bf4960e (patch)
tree3f0d9fe8d074bc4c3cf469a41b679d0be3bc8ef7 /drivers/input
parent4c076eb0cfd9fa3f8900ac3dbdcaaca2f5fc2c1e (diff)
downloadop-kernel-dev-1bc754579ff17288d7dc69d2c3e38e4e6bf4960e.zip
op-kernel-dev-1bc754579ff17288d7dc69d2c3e38e4e6bf4960e.tar.gz
Input: max7359 - add CONFIG_PM_SLEEP to suspend/resume
Add CONFIG_PM_SLEEP to suspend/resume functions to fix the build warnings when CONFIG_PM_SLEEP is not selected. This is because sleep PM callbacks defined by SET_SYSTEM_SLEEP_PM_OPS are only used when the CONFIG_PM_SLEEP is enabled. drivers/input/keyboard/max7359_keypad.c:275:12: warning: 'max7359_suspend' defined but not used [-Wunused-function] drivers/input/keyboard/max7359_keypad.c:287:12: warning: 'max7359_resume' defined but not used [-Wunused-function] Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/max7359_keypad.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/max7359_keypad.c b/drivers/input/keyboard/max7359_keypad.c
index 7c7af2b..bc2cdaf 100644
--- a/drivers/input/keyboard/max7359_keypad.c
+++ b/drivers/input/keyboard/max7359_keypad.c
@@ -271,7 +271,7 @@ static int max7359_remove(struct i2c_client *client)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int max7359_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
OpenPOWER on IntegriCloud