summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-08-06 10:09:02 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-08-06 10:09:02 +0200
commit398404d8372ce0428abc49d059487e3f83d45249 (patch)
tree52d404f028fcc3027d84273f1ddc995f1e8d2cdb /include/acpi
parent460a53106ac39b74625d1104d9a113e0f3716c18 (diff)
parent2a61e9f60b2bd626e8c3dc428c782b812c878a0c (diff)
downloadlinux-398404d8372ce0428abc49d059487e3f83d45249.tar.bz2
Merge back ACPICA material for 4.19.
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpixf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 48d84f0d9547..88072c92ace2 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -12,7 +12,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20180531
+#define ACPI_CA_VERSION 0x20180629
#include <acpi/acconfig.h>
#include <acpi/actypes.h>