summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorBob Moore2014-02-11 03:25:27 +0100
committerRafael J. Wysocki2014-02-13 15:28:08 +0100
commitfaae404ebdc6bba744919d82e64c16448eb24a36 (patch)
treeb2eb23ac14e3d5fb07367f0b026923ca5aeebad9 /drivers/acpi
parentACPICA: Update version to 20140114. (diff)
downloadkernel-qcow2-linux-faae404ebdc6bba744919d82e64c16448eb24a36.tar.gz
kernel-qcow2-linux-faae404ebdc6bba744919d82e64c16448eb24a36.tar.xz
kernel-qcow2-linux-faae404ebdc6bba744919d82e64c16448eb24a36.zip
ACPICA: Add "Windows 2013" string to _OSI support.
This urgent patch is cherry picked from ACPICA upstream. It is reported that some platforms fail to boot without this new _OSI string. This change adds this string for Windows 8.1 and Server 2012 R2. Reported-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Bob Moore <Robert.Moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/utosi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c
index e210e51a12f3..1e5525e87d34 100644
--- a/drivers/acpi/acpica/utosi.c
+++ b/drivers/acpi/acpica/utosi.c
@@ -74,6 +74,7 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = {
{"Windows 2006 SP2", NULL, 0, ACPI_OSI_WIN_VISTA_SP2}, /* Windows Vista SP2 - Added 09/2010 */
{"Windows 2009", NULL, 0, ACPI_OSI_WIN_7}, /* Windows 7 and Server 2008 R2 - Added 09/2009 */
{"Windows 2012", NULL, 0, ACPI_OSI_WIN_8}, /* Windows 8 and Server 2012 - Added 08/2012 */
+ {"Windows 2013", NULL, 0, ACPI_OSI_WIN_8}, /* Windows 8.1 and Server 2012 R2 - Added 01/2014 */
/* Feature Group Strings */