[PATCH] swsusp duplicates

Geert Uytterhoeven (geert@linux-m68k.org)
Mon, 18 Nov 2002 18:29:17 +0100 (MET)


Some software suspend declarations from suspend.h are duplicated in reboot.h.
Especially the `extern void software_suspend(void)' conflicts with the static
dummy one when software suspend is disabled.

--- linux-2.5.48/include/linux/reboot.h Sat May 25 14:28:53 2002
+++ linux-m68k-2.5.48/include/linux/reboot.h Mon Nov 18 15:19:22 2002
@@ -48,13 +48,6 @@
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 */

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

- 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/