diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
| commit | 35858adbfca13678af99fb31618ef4428d6dedb0 (patch) | |
| tree | 3336feaa61324486945816cb52c347733e7c0821 /include/linux/pm.h | |
| parent | 197d4db752e67160d79fed09968c2140376a80a3 (diff) | |
| parent | 4b70858ba8d4537daf782defebe5f2ff80ccef2b (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 0d65934246af..198b8f9fe05e 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
| @@ -219,7 +219,7 @@ struct dev_pm_ops { | |||
| 219 | * to RAM and hibernation. | 219 | * to RAM and hibernation. |
| 220 | */ | 220 | */ |
| 221 | #define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \ | 221 | #define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \ |
| 222 | struct dev_pm_ops name = { \ | 222 | const struct dev_pm_ops name = { \ |
| 223 | .suspend = suspend_fn, \ | 223 | .suspend = suspend_fn, \ |
| 224 | .resume = resume_fn, \ | 224 | .resume = resume_fn, \ |
| 225 | .freeze = suspend_fn, \ | 225 | .freeze = suspend_fn, \ |