git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
[pandora-kernel.git]
/
drivers
/
input
/
keyboard
/
sh_keysc.c
diff --git
a/drivers/input/keyboard/sh_keysc.c
b/drivers/input/keyboard/sh_keysc.c
index
6876700
..
934aeb5
100644
(file)
--- a/
drivers/input/keyboard/sh_keysc.c
+++ b/
drivers/input/keyboard/sh_keysc.c
@@
-291,7
+291,7
@@
static int __devexit sh_keysc_remove(struct platform_device *pdev)
return 0;
}
-#if CONFIG_PM_SLEEP
+#if
def
CONFIG_PM_SLEEP
static int sh_keysc_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);