diff options
| author | Bob Moore <robert.moore@intel.com> | 2012-08-17 04:55:02 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-09-21 06:26:16 +0200 |
| commit | a57f7f9175b8ccbc9df83ac13860488913115de4 (patch) | |
| tree | 72c748260548b6f512af393653db964d3ca83ac0 /drivers/acpi | |
| parent | ACPICA: Comment update: Fix some typos in actble.h (diff) | |
| download | linux-a57f7f9175b8ccbc9df83ac13860488913115de4.tar.xz linux-a57f7f9175b8ccbc9df83ac13860488913115de4.zip | |
ACPICA: Add Windows8/Server2012 string for _OSI method.
This change adds a new _OSI string, "Windows 2012" for both Windows 8
and Windows Server 2012.
From Microsoft document "How to Identify the Windows Version in ACPI
by Using _OSI", July 13, 2012.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/aclocal.h | 1 | ||||
| -rw-r--r-- | drivers/acpi/acpica/utosi.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index cc80fe10e8ea..493529a3500a 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h @@ -932,6 +932,7 @@ struct acpi_bit_register_info { #define ACPI_OSI_WIN_VISTA_SP1 0x09 #define ACPI_OSI_WIN_VISTA_SP2 0x0A #define ACPI_OSI_WIN_7 0x0B +#define ACPI_OSI_WIN_8 0x0C #define ACPI_ALWAYS_ILLEGAL 0x00 diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c index 34ef0bd7e4b4..676285d6116d 100644 --- a/drivers/acpi/acpica/utosi.c +++ b/drivers/acpi/acpica/utosi.c @@ -73,6 +73,7 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = { {"Windows 2006 SP1", NULL, 0, ACPI_OSI_WIN_VISTA_SP1}, /* Windows Vista SP1 - Added 09/2009 */ {"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 */ /* Feature Group Strings */ |