diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-02-07 15:58:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 19:12:33 -0500 |
commit | 46cd2f32baf181b74b16cceb123bab6fe1f61f85 (patch) | |
tree | 6f6c7b370e4004c629bb6c6cab3f822951eb9a26 /kernel/power/power.h | |
parent | 7b4fe29e00a5ab4e778bb24be86d836a25570bc9 (diff) |
[PATCH] Fix build failure in recent pm_prepare_* changes.
Fix compilation problem in PM headers.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power/power.h')
-rw-r--r-- | kernel/power/power.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index d8f0d1a76bae..388dba680841 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h | |||
@@ -1,14 +1,6 @@ | |||
1 | #include <linux/suspend.h> | 1 | #include <linux/suspend.h> |
2 | #include <linux/utsname.h> | 2 | #include <linux/utsname.h> |
3 | 3 | ||
4 | /* With SUSPEND_CONSOLE defined suspend looks *really* cool, but | ||
5 | we probably do not take enough locks for switching consoles, etc, | ||
6 | so bad things might happen. | ||
7 | */ | ||
8 | #if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE) | ||
9 | #define SUSPEND_CONSOLE (MAX_NR_CONSOLES-1) | ||
10 | #endif | ||
11 | |||
12 | struct swsusp_info { | 4 | struct swsusp_info { |
13 | struct new_utsname uts; | 5 | struct new_utsname uts; |
14 | u32 version_code; | 6 | u32 version_code; |
@@ -42,14 +34,6 @@ static struct subsys_attribute _name##_attr = { \ | |||
42 | 34 | ||
43 | extern struct subsystem power_subsys; | 35 | extern struct subsystem power_subsys; |
44 | 36 | ||
45 | #ifdef SUSPEND_CONSOLE | ||
46 | extern int pm_prepare_console(void); | ||
47 | extern void pm_restore_console(void); | ||
48 | #else | ||
49 | static int pm_prepare_console(void) { return 0; } | ||
50 | static void pm_restore_console(void) {} | ||
51 | #endif | ||
52 | |||
53 | /* References to section boundaries */ | 37 | /* References to section boundaries */ |
54 | extern const void __nosave_begin, __nosave_end; | 38 | extern const void __nosave_begin, __nosave_end; |
55 | 39 | ||