diff options
author | Bob Moore <robert.moore@intel.com> | 2010-10-17 20:50:47 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-10-17 22:55:40 -0400 |
commit | 23ebbf07068f84b7ed119a0bef4a3f0ebb82c894 (patch) | |
tree | 7602fe60f4643ba46f6a648fec971cce51fc13f6 /drivers/acpi | |
parent | 34cf66e724a2bf0a406d59b18f5bfeed746d7979 (diff) |
ACPICA: Add Vista SP2 to supported _OSI strings
Added "Windows 2006 SP2" for Vista SP2.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/acpica/aclocal.h | 3 | ||||
-rw-r--r-- | drivers/acpi/acpica/utosi.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index 04ce32272546..1bb18c0d0881 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h | |||
@@ -908,7 +908,8 @@ struct acpi_bit_register_info { | |||
908 | #define ACPI_OSI_WIN_VISTA 0x07 | 908 | #define ACPI_OSI_WIN_VISTA 0x07 |
909 | #define ACPI_OSI_WINSRV_2008 0x08 | 909 | #define ACPI_OSI_WINSRV_2008 0x08 |
910 | #define ACPI_OSI_WIN_VISTA_SP1 0x09 | 910 | #define ACPI_OSI_WIN_VISTA_SP1 0x09 |
911 | #define ACPI_OSI_WIN_7 0x0A | 911 | #define ACPI_OSI_WIN_VISTA_SP2 0x0A |
912 | #define ACPI_OSI_WIN_7 0x0B | ||
912 | 913 | ||
913 | #define ACPI_ALWAYS_ILLEGAL 0x00 | 914 | #define ACPI_ALWAYS_ILLEGAL 0x00 |
914 | 915 | ||
diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c index 0a37950c96aa..18c59a85fdca 100644 --- a/drivers/acpi/acpica/utosi.c +++ b/drivers/acpi/acpica/utosi.c | |||
@@ -71,6 +71,7 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = { | |||
71 | {"Windows 2006", NULL, 0, ACPI_OSI_WIN_VISTA}, /* Windows Vista - Added 03/2006 */ | 71 | {"Windows 2006", NULL, 0, ACPI_OSI_WIN_VISTA}, /* Windows Vista - Added 03/2006 */ |
72 | {"Windows 2006.1", NULL, 0, ACPI_OSI_WINSRV_2008}, /* Windows Server 2008 - Added 09/2009 */ | 72 | {"Windows 2006.1", NULL, 0, ACPI_OSI_WINSRV_2008}, /* Windows Server 2008 - Added 09/2009 */ |
73 | {"Windows 2006 SP1", NULL, 0, ACPI_OSI_WIN_VISTA_SP1}, /* Windows Vista SP1 - Added 09/2009 */ | 73 | {"Windows 2006 SP1", NULL, 0, ACPI_OSI_WIN_VISTA_SP1}, /* Windows Vista SP1 - Added 09/2009 */ |
74 | {"Windows 2006 SP2", NULL, 0, ACPI_OSI_WIN_VISTA_SP2}, /* Windows Vista SP2 - Added 09/2010 */ | ||
74 | {"Windows 2009", NULL, 0, ACPI_OSI_WIN_7}, /* Windows 7 and Server 2008 R2 - Added 09/2009 */ | 75 | {"Windows 2009", NULL, 0, ACPI_OSI_WIN_7}, /* Windows 7 and Server 2008 R2 - Added 09/2009 */ |
75 | 76 | ||
76 | /* Feature Group Strings */ | 77 | /* Feature Group Strings */ |