[PATCH] fix duplicate decls in swsusp

Remove the reboot.h declaration of swsusp functions that clash
with the no-op inline.

diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 4c8b4276c957a407d4bb8bd7386e0d1f40e93e79..5608cfedf709c0d40cad989b32c0aacb6cb4ce88 100644 (file)
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -48,13 +48,6 @@ extern void machine_restart(char *cmd);
 extern void machine_halt(void);
 extern void machine_power_off(void);
 
-/*
- * Architecture-independent suspend facility
- */
-
-extern void software_suspend(void);
-extern unsigned char software_suspend_enabled;
-
 #endif
 
 #endif /* _LINUX_REBOOT_H */

diff --git a/kernel/sys.c b/kernel/sys.c
index 9e4b66388c2917b858ef8c8c75533a7054029280..e8bd2c9f969b6945353c0fcda152e33e31e83777 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -21,6 +21,7 @@
 #include <linux/times.h>
 #include <linux/security.h>
 #include <linux/dcookies.h>
+#include <linux/suspend.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>