diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
| commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
| tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /include/linux/pm.h | |
| parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
| parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
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); |
