Merge commit 'v2.6.33-rc5' into next

2010-01-21 23:55:25 -08:00
parent 3bf127637e 92dcffb916
commit 7755726fe9
3923 changed files with 169153 additions and 73221 deletions
--- 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)
 	return 0;
 }

-static struct dev_pm_ops sh_keysc_dev_pm_ops = {
+static const struct dev_pm_ops sh_keysc_dev_pm_ops = {
 	.suspend = sh_keysc_suspend,
 	.resume = sh_keysc_resume,
 };