swsusp: fix compilation for other architectures

From: Pavel Machek (pavel@ucw.cz)
Date: Mon May 27 2002 - 12:21:56 EST

Hi!

Currently, on machine where suspend is not yet supported, compilation
fails even in case user did not actually requested suspend. This
"fixes" it -- compilation only fails when suspend is needed and not
supported. Please apply,
                                                                Pavel

--- clean/include/asm-i386/suspend.h Sun May 26 19:32:03 2002
+++ linux-swsusp/include/asm-i386/suspend.h Mon May 27 19:11:25 2002
@@ -1,13 +1,8 @@
-#ifndef __ASM_I386_SUSPEND_H
-#define __ASM_I386_SUSPEND_H
-#endif
-
 /*
  * Copyright 2001-2002 Pavel Machek <pavel@suse.cz>
  * Based on code
  * Copyright 2001 Patrick Mochel <mochel@osdl.org>
  */
-#if defined(SUSPEND_C) || defined(ACPI_C)
 #include <asm/desc.h>
 #include <asm/i387.h>
 
@@ -225,7 +220,6 @@
         do_fpu_end();
 }
 
-#endif
 #ifdef SUSPEND_C
 /* Local variables for do_magic */
 static int loop __nosavedata = 0;
--- clean/include/linux/suspend.h Sun May 26 19:32:04 2002
+++ linux-swsusp/include/linux/suspend.h Mon May 27 19:11:45 2002
@@ -1,7 +1,9 @@
 #ifndef _LINUX_SWSUSP_H
 #define _LINUX_SWSUSP_H
 
+#if defined(SUSPEND_C) || defined(ACPI_C)
 #include <asm/suspend.h>
+#endif
 #include <linux/swap.h>
 #include <linux/notifier.h>
 #include <linux/config.h> 

-- 
(about SSSCA) "I don't say this lightly.  However, I really think that the U.S.
no longer is classifiable as a democracy, but rather as a plutocracy." --hpa
-
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 May 31 2002 - 22:00:21 EST