diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /include/linux/acpi.h | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 6a9894bb0..993fd93e7 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -114,6 +114,10 @@ typedef int acpi_dstate_t; #define ACPI_TMR_VAL_EXT 0x00000100 #define ACPI_DCK_CAP 0x00000200 +/* FACP BOOT_ARCH flags */ +#define FACP_BOOT_ARCH_LEGACY_DEVICES 0x0001 +#define FACP_BOOT_ARCH_KBD_CONTROLLER 0x0002 + /* FACS flags */ #define ACPI_S4BIOS 0x00000001 @@ -184,8 +188,7 @@ struct acpi_facp { __u8 day_alarm; __u8 mon_alarm; __u8 century; - __u8 reserved4; - __u8 reserved5; + __u16 boot_arch; __u8 reserved6; __u32 flags; } __attribute__ ((packed)); @@ -221,6 +224,9 @@ enum ACPI_ENTER_LVL3_LAT, ACPI_P_LVL2_LAT, ACPI_P_LVL3_LAT, + ACPI_C1_TIME, + ACPI_C2_TIME, + ACPI_C3_TIME, ACPI_S0_SLP_TYP, ACPI_S1_SLP_TYP, ACPI_S5_SLP_TYP, |