diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
| commit | 7755726fe90a8b253659756e6de68c1a55aa427f (patch) | |
| tree | a3523fa77e07854db3b8089e3066a55ea997060c /drivers/input/keyboard/sh_keysc.c | |
| parent | 3bf127637e22ddf95e67e10a23c339cee3d52429 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'drivers/input/keyboard/sh_keysc.c')
| -rw-r--r-- | drivers/input/keyboard/sh_keysc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c index 25706f802258..efcc3a3b9b53 100644 --- a/drivers/input/keyboard/sh_keysc.c +++ b/drivers/input/keyboard/sh_keysc.c | |||
| @@ -295,7 +295,7 @@ static int sh_keysc_resume(struct device *dev) | |||
| 295 | return 0; | 295 | return 0; |
| 296 | } | 296 | } |
| 297 | 297 | ||
| 298 | static struct dev_pm_ops sh_keysc_dev_pm_ops = { | 298 | static const struct dev_pm_ops sh_keysc_dev_pm_ops = { |
| 299 | .suspend = sh_keysc_suspend, | 299 | .suspend = sh_keysc_suspend, |
| 300 | .resume = sh_keysc_resume, | 300 | .resume = sh_keysc_resume, |
| 301 | }; | 301 | }; |