diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
| commit | 3f603ed319d5120e883e64ac5967b2fc848fc43b (patch) | |
| tree | 52ef311c245e4e4cd623b546ea1daf05a5ea8911 /include/linux/pm.h | |
| parent | 55ee3b8365fd5d301b9076eea739146f2b91e82c (diff) | |
| parent | 5028770a42e7bc4d15791a44c28f0ad539323807 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
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 | ||