This fixes a warning caused by conflicting static vs. extern wrt. swsusp.
include/linux/reboot.h | 7 -------
kernel/sys.c | 1 +
2 files changed, 1 insertion(+), 7 deletions(-)
diff -urpN cleanup-2.5.47-3/include/linux/reboot.h cleanup-2.5.47-4/include/linux/reboot.h
--- cleanup-2.5.47-3/include/linux/reboot.h 2002-11-10 19:28:33.000000000 -0800
+++ cleanup-2.5.47-4/include/linux/reboot.h 2002-11-15 03:10:22.000000000 -0800
@@ -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 -urpN cleanup-2.5.47-3/kernel/sys.c cleanup-2.5.47-4/kernel/sys.c
--- cleanup-2.5.47-3/kernel/sys.c 2002-11-14 23:42:02.000000000 -0800
+++ cleanup-2.5.47-4/kernel/sys.c 2002-11-15 03:10:35.000000000 -0800
@@ -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>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Nov 15 2002 - 22:00:37 EST