summaryrefslogtreecommitdiff
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 17:53:24 -0800
committerLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 17:53:24 -0800
commitc9b9226830bdc88e57166ec7355bccda28eb95f5 (patch)
tree4b95963e7acd8d8b947d7c1baed9007eea243032 /include/linux/acpi.h
parent5e787ed514bb4b83cf5c74db1245547aecc4375a (diff)
v2.4.0.11 -> v2.4.0.12
- Get non-cpuid Cyrix probing right (it's not a NexGen) - Jens Axboe: cdrom tray status and queing cleanups - AGP GART: don't disable VIA, and allow i815 with external AGP - Coda: use iget4() in order to have big inode numbers without clashes. - Fix UDF writepage() page locking - NIIBE Yutaka: SuperH update - Martin Diehl and others: SiS pirq routing fixes - Andy Grover: ACPI update - Andrea Arkangeli: LVM update - Ingo Molnar: RAID cleanups - David Miller: sparc and networking updates - Make NFS really be able to handle large files
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 38b7a6a982a5..4fce3f847249 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -28,19 +28,6 @@
#include <linux/wait.h>
#endif /* __KERNEL__ */
-/*
- * System sleep states
- */
-enum
-{
- ACPI_S0, /* working */
- ACPI_S1, /* sleep */
- ACPI_S2, /* sleep */
- ACPI_S3, /* sleep */
- ACPI_S4, /* non-volatile sleep */
- ACPI_S5, /* soft-off */
-};
-
typedef int acpi_sstate_t;
/*