projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
input
/
keyboard
/
samsung-keypad.c
diff --git
a/drivers/input/keyboard/samsung-keypad.c
b/drivers/input/keyboard/samsung-keypad.c
index 43ebd9c174bc8237c0fc97f0833a3efa25927aa1..6b9fdf6cf8e83f017dcdaba0281f8856208c0fc0 100644
(file)
--- a/
drivers/input/keyboard/samsung-keypad.c
+++ b/
drivers/input/keyboard/samsung-keypad.c
@@
-463,7
+463,7
@@
static int samsung_keypad_remove(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM
_RUNTIME
+#ifdef CONFIG_PM
static int samsung_keypad_runtime_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);