summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorPatrick Mochel <mochel@osdl.org>2003-09-02 00:14:29 -0700
committerPatrick Mochel <mochel@osdl.org>2003-09-02 00:14:29 -0700
commit7b9354934c49c9bbc42a79910f0622f3a6c174a6 (patch)
tree47e7fdac4537fadec7318f71284c9ff6d2671087 /include/linux
parentaf8b3563be2cc46bab716c5842a2fbae5668c742 (diff)
parentaad408d0015e779e04167fe3043fd4999db5a0bd (diff)
Merge osdl.org:/home/mochel/src/kernel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/linux-2.5-power
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/suspend.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 132db86c961a..ed8d796f1849 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -53,6 +53,7 @@ extern suspend_pagedir_t *pagedir_nosave __nosavedata;
extern void do_suspend_lowlevel(int resume);
extern void do_suspend_lowlevel_s4bios(int resume);
+extern int software_suspend(void);
#else /* CONFIG_SOFTWARE_SUSPEND */
static inline int software_suspend(void)
{