diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-04 21:39:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-04 21:39:31 -0500 |
| commit | c2cc87ca9561ddfe744d446789cc10f507e87db9 (patch) | |
| tree | d505fc0110eb1a3d8750ba2f67648c131f0d9aca /include/linux/pm.h | |
| parent | ce1eeb95fc4eb25109c00bea3e83a87eeff6b07d (diff) | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index c61d5de837ef..1514098d156d 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
| @@ -170,6 +170,7 @@ typedef int __bitwise suspend_disk_method_t; | |||
| 170 | 170 | ||
| 171 | struct pm_ops { | 171 | struct pm_ops { |
| 172 | suspend_disk_method_t pm_disk_mode; | 172 | suspend_disk_method_t pm_disk_mode; |
| 173 | int (*valid)(suspend_state_t state); | ||
| 173 | int (*prepare)(suspend_state_t state); | 174 | int (*prepare)(suspend_state_t state); |
| 174 | int (*enter)(suspend_state_t state); | 175 | int (*enter)(suspend_state_t state); |
| 175 | int (*finish)(suspend_state_t state); | 176 | int (*finish)(suspend_state_t state); |