diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 18:09:23 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 18:09:23 -0400 |
| commit | c514720716c7b109ff980f8b3cb93f9af872c91c (patch) | |
| tree | 490a9578995705de69712893a190b67651bddc56 /include/linux/pm.h | |
| parent | 07929dcb963786512c760dd3ecd148d89295e7e5 (diff) | |
| parent | 1e279dd855d15b72364b4103f872d67d8592647e (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
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 14479325e3f3..7aeb208ed713 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
| @@ -176,7 +176,7 @@ struct pm_ops { | |||
| 176 | }; | 176 | }; |
| 177 | 177 | ||
| 178 | extern void pm_set_ops(struct pm_ops *); | 178 | extern void pm_set_ops(struct pm_ops *); |
| 179 | 179 | extern struct pm_ops *pm_ops; | |
| 180 | extern int pm_suspend(suspend_state_t state); | 180 | extern int pm_suspend(suspend_state_t state); |
| 181 | 181 | ||
| 182 | 182 | ||