diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
| commit | b2faf597d93bdf5e2d12d93ea0815935a73f749e (patch) | |
| tree | 1876616290ff282b8a0814e2429d23e0104f3701 /include/linux/suspend.h | |
| parent | 638e174688f58200d0deb7435093435e7d737b09 (diff) | |
| parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) | |
Merge branch 'origin'
Diffstat (limited to 'include/linux/suspend.h')
| -rw-r--r-- | include/linux/suspend.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 5dc94e777fab..43bcd13eb1ec 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h | |||
| @@ -42,10 +42,6 @@ extern void mark_free_pages(struct zone *zone); | |||
| 42 | #ifdef CONFIG_PM | 42 | #ifdef CONFIG_PM |
| 43 | /* kernel/power/swsusp.c */ | 43 | /* kernel/power/swsusp.c */ |
| 44 | extern int software_suspend(void); | 44 | extern int software_suspend(void); |
| 45 | |||
| 46 | extern int pm_prepare_console(void); | ||
| 47 | extern void pm_restore_console(void); | ||
| 48 | |||
| 49 | #else | 45 | #else |
| 50 | static inline int software_suspend(void) | 46 | static inline int software_suspend(void) |
| 51 | { | 47 | { |