summaryrefslogtreecommitdiffstats
path: root/include/acpi/acpixf.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-20 13:25:02 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-20 13:25:02 +0100
commit6ac4a2ab16af49a86ad16bdab1de72d5b809a9c1 (patch)
tree6cdaa76dbcdfe070e293b3d6ab4c78649c8ed059 /include/acpi/acpixf.h
parent94a81caca3757a2eda026cbd592db8e321fcba43 (diff)
parent6e596084833b95662dfe90e1f30d83ccbd64575c (diff)
Merge branch 'acpica'
* acpica: (29 commits) ACPICA: Revert "Headers: Deploy #pragma pack (push) and (pop)." ACPICA: Update version to 20140214. ACPICA: Prevent infinite loops when traversing corrupted lists. ACPICA: Debugger: Add missing objects; Traverse linked lists ACPICA: Add text: ACPICA policy for new _OSI strings. No functional change. ACPICA: Update for _PRP predefined name. ACPICA: Cleanup/improve global variable declarations. ACPICA: Comment update - no functional change. ACPICA: Do not abort _PRT repair on a single subpackage failure. ACPICA: Harden _PRT repair code; check for minimum package length. ACPICA: Restore code that repairs NULL package elements in return values. ACPICA: Properly handle NULL entries in _PRT return packages. ACPICA: Update conditional compilation flags for resource dump functions. ACPICA: Predefined names: Add support for the _PRP method. ACPICA: Headers: Deploy #pragma pack (push) and (pop). ACPICA: Add boot option to disable auto return object repair ACPICA: acpidump: Remove integer types translation protection. ACPICA: acpidump: Add sparse declarators support. ACPICA: Add "Windows 2013" string to _OSI support. ACPICA: Update version to 20140114. ...
Diffstat (limited to 'include/acpi/acpixf.h')
-rw-r--r--include/acpi/acpixf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 34bad459c11..b0b01b13ea9 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20131218
+#define ACPI_CA_VERSION 0x20140214
#include <acpi/acconfig.h>
#include <acpi/actypes.h>