diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-21 14:10:56 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-21 14:10:56 +0200 |
| commit | 082c119da469ae3f68740d7866776c1bd4a9dda7 (patch) | |
| tree | 160cdfda1435953a95f0da6ef0986d1440ee8899 /include | |
| parent | Linux 3.18-rc1 (diff) | |
| parent | ACPICA: Update version to 20140926. (diff) | |
| download | linux-dev-082c119da469ae3f68740d7866776c1bd4a9dda7.tar.xz linux-dev-082c119da469ae3f68740d7866776c1bd4a9dda7.zip | |
Merge branch 'acpica'
* acpica:
ACPICA: Update version to 20140926.
ACPICA: acpiexec: Do not put STDIN into raw mode unless it is a terminal.
ACPICA: iASL/Disassembler: Add support for hardware summary mapfiles.
ACPICA: Events: Reduce source code difference for the ACPI_EVENT_FLAG_HANDLE renaming.
ACPICA: Events: Reduce source code difference for the ACPI_EVENT_FLAG_HANDLE support.
ACPICA: Events: Update GPE handler removal, match behavior of handler install.
ACPICA: Events: Reduce source code difference in acpi_install_gpe_handler().
ACPICA: Events: Reduce indent divergences of events files.
ACPICA: acpidump: Add ACPI 1.0 RSDP support.
ACPICA: Add string for _DDN method name.
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acnames.h | 1 | ||||
| -rw-r--r-- | include/acpi/acpixf.h | 2 | ||||
| -rw-r--r-- | include/acpi/actypes.h | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h index f97804bdf1ff..7461327e14e4 100644 --- a/include/acpi/acnames.h +++ b/include/acpi/acnames.h @@ -52,6 +52,7 @@ #define METHOD_NAME__CBA "_CBA" #define METHOD_NAME__CID "_CID" #define METHOD_NAME__CRS "_CRS" +#define METHOD_NAME__DDN "_DDN" #define METHOD_NAME__HID "_HID" #define METHOD_NAME__INI "_INI" #define METHOD_NAME__PLD "_PLD" diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 9fc1d71c82bc..ab2acf629a64 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20140828 +#define ACPI_CA_VERSION 0x20140926 #include <acpi/acconfig.h> #include <acpi/actypes.h> diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index ac03ec81d342..7000e66f768e 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -721,7 +721,7 @@ typedef u32 acpi_event_type; * | | | +--- Enabled for wake? * | | +----- Set? * | +------- Has a handler? - * +----------- <Reserved> + * +------------- <Reserved> */ typedef u32 acpi_event_status; @@ -729,7 +729,7 @@ typedef u32 acpi_event_status; #define ACPI_EVENT_FLAG_ENABLED (acpi_event_status) 0x01 #define ACPI_EVENT_FLAG_WAKE_ENABLED (acpi_event_status) 0x02 #define ACPI_EVENT_FLAG_SET (acpi_event_status) 0x04 -#define ACPI_EVENT_FLAG_HANDLE (acpi_event_status) 0x08 +#define ACPI_EVENT_FLAG_HAS_HANDLER (acpi_event_status) 0x08 /* Actions for acpi_set_gpe, acpi_gpe_wakeup, acpi_hw_low_set_gpe */ |