diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-22 21:48:20 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-22 21:48:20 +0100 |
| commit | 74fc9cb2b950e3017e9df04a02a29e7cc92dc5a1 (patch) | |
| tree | 750f65af1dea6418dd2c2b9b7c7b30bd131da39e /include/acpi | |
| parent | 76540969b1cf26349eb8867b57657b03c89025e5 (diff) | |
| parent | a3ccfcc1e7b52047c840249e30008678ac1046c3 (diff) | |
| download | linux-stable-74fc9cb2b950e3017e9df04a02a29e7cc92dc5a1.tar.gz linux-stable-74fc9cb2b950e3017e9df04a02a29e7cc92dc5a1.tar.bz2 linux-stable-74fc9cb2b950e3017e9df04a02a29e7cc92dc5a1.zip | |
Merge branch 'acpica' into acpi-hotplug
The subsequent commits depend on the 'acpica' material.
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acconfig.h | 2 | ||||
| -rw-r--r-- | include/acpi/acpixf.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h index d98c67001840..3ea214cff349 100644 --- a/include/acpi/acconfig.h +++ b/include/acpi/acconfig.h @@ -83,7 +83,9 @@ * Should the subsystem abort the loading of an ACPI table if the * table checksum is incorrect? */ +#ifndef ACPI_CHECKSUM_ABORT #define ACPI_CHECKSUM_ABORT FALSE +#endif /* * Generate a version of ACPICA that only supports "reduced hardware" diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index d8f9457755b4..4278aba96503 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 0x20130927 +#define ACPI_CA_VERSION 0x20131115 #include <acpi/acconfig.h> #include <acpi/actypes.h> |