diff options
| author | Pavel Machek <pavel@ucw.cz> | 2002-06-15 00:53:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-15 00:53:09 -0700 |
| commit | ef8e826c33ea5498aff4110dcd7f24e5f729e412 (patch) | |
| tree | 7bb3d38122bfccf6a73048c8c2476df8cc0bb31f /include | |
| parent | 3f52c6527e21ac9b5db9ffd2c2b4fe1ac7f9ef48 (diff) | |
[PATCH] suspend-to-{ram/disk} cleanups/fixes for 2.5.21
This kills Sysrq-D support (did not work anyway, and complicated
code).
Adds resume support to i8259A (otherwise interrupts will not work
after S3).
HAVE_NEW_DEVICE_MODEL is always true in 2.5, so we should define
it. S3 can't work properly without that. Also limit toshiba workaround
to S1. (This hide lack of i8259A support for me).
Fixes compilation, and kills <asm/suspend.h> being included
twice with ugly hacks around.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/suspend.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index f63d72634a07..316ec1a6e30c 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -1,7 +1,7 @@ #ifndef _LINUX_SWSUSP_H #define _LINUX_SWSUSP_H -#if defined(SUSPEND_C) || defined(ACPI_C) +#ifdef CONFIG_X86 #include <asm/suspend.h> #endif #include <linux/swap.h> |