| commit | aa7eb8e78d8ecd6cd0475d86ea8385ff9cb47ece | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Wed Jul 27 00:54:47 2011 -0700 |
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Wed Jul 27 00:54:47 2011 -0700 |
| tree | 3f9e98fadd5124fb05e8f6f9b06aa23698d4f215 | |
| parent | cca8edfd2ec2a34d9f50f593bc753bb11e1bc1f5 [diff] | |
| parent | 3c6b50141ef9f0a8844bf1357b80c0cdf518bf05 [diff] |
Merge branch 'next' into for-linus
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c index 6876700..934aeb583 100644 --- a/drivers/input/keyboard/sh_keysc.c +++ b/drivers/input/keyboard/sh_keysc.c
@@ -291,7 +291,7 @@ return 0; } -#if CONFIG_PM_SLEEP +#ifdef CONFIG_PM_SLEEP static int sh_keysc_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev);