* fix swsusp warning
@ 2002-11-15 11:55 William Lee Irwin III
0 siblings, 0 replies; only message in thread
From: William Lee Irwin III @ 2002-11-15 11:55 UTC (permalink / raw)
To: kernel-janitor-discuss; +Cc: pavel, linux-kernel
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>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2002-11-15 11:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-11-15 11:55 fix swsusp warning William Lee Irwin III
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox