diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-09-09 01:52:22 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-09-09 01:52:22 -0700 |
| commit | b9ac82d971d87ccd73b8ca2356b59bf1590b7621 (patch) | |
| tree | e23d3542fecc515661aee433f6d45c9e8efe5899 | |
| parent | 3f6506cad1b435e79c933f702dfa9b370885943a (diff) | |
[power] Make pmdisk compile when CONFIG_SOFTWARE_SUSPEND=n.
| -rw-r--r-- | include/linux/suspend.h | 5 | ||||
| -rw-r--r-- | kernel/power/power.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index ed8d796f1849..89f9bebfb39f 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -10,7 +10,7 @@ #include <linux/init.h> #include <linux/pm.h> -#ifdef CONFIG_SOFTWARE_SUSPEND +#ifdef CONFIG_PM /* page backup entry */ typedef struct pbe { unsigned long address; /* address of the copy */ @@ -53,6 +53,9 @@ extern suspend_pagedir_t *pagedir_nosave __nosavedata; extern void do_suspend_lowlevel(int resume); extern void do_suspend_lowlevel_s4bios(int resume); +#endif /* CONFIG_PM */ + +#ifdef CONFIG_SOFTWARE_SUSPEND extern int software_suspend(void); #else /* CONFIG_SOFTWARE_SUSPEND */ static inline int software_suspend(void) diff --git a/kernel/power/power.h b/kernel/power/power.h index e0874ed266f5..d180b0a192cd 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -9,7 +9,7 @@ #endif -#ifdef CONFIG_SOFTWARE_SUSPEND +#ifdef CONFIG_PM_DISK extern int pm_suspend_disk(void); #else |