diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-19 22:41:27 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-19 22:41:27 +0200 |
| commit | 5c40321e6e6a8ca8552c5c69d041d7f7f3205318 (patch) | |
| tree | 1ee5916ea352a4dda4fbee92605b916b282a3ca9 /drivers/mfd/glamo/glamo-fb.c | |
| parent | 82af18df11de291fdfed385a510b90b3d6425d64 (diff) | |
| parent | 87a15e3aa7538bfd187eb44b7580512c59b3fb86 (diff) | |
Merge branch 'glamo-2.6.34' into om-gta02-2.6.34
Diffstat (limited to 'drivers/mfd/glamo/glamo-fb.c')
| -rw-r--r-- | drivers/mfd/glamo/glamo-fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index cffb18032fa..29c16f019aa 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -943,7 +943,7 @@ static int glamofb_resume(struct device *dev) return 0; } -static struct dev_pm_ops glamofb_pm_ops = { +static const struct dev_pm_ops glamofb_pm_ops = { .suspend = glamofb_suspend, .resume = glamofb_resume, }; |