diff options
| author | Bob Moore <robert.moore@intel.com> | 2010-10-18 02:50:47 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-18 04:55:40 +0200 |
| commit | 23ebbf07068f84b7ed119a0bef4a3f0ebb82c894 (patch) | |
| tree | 7602fe60f4643ba46f6a648fec971cce51fc13f6 | |
| parent | ACPICA: Eliminate duplicate code in acpi_ut_execute_* functions (diff) | |
| download | linux-23ebbf07068f84b7ed119a0bef4a3f0ebb82c894.tar.xz linux-23ebbf07068f84b7ed119a0bef4a3f0ebb82c894.zip | |
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>
| -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 { #define ACPI_OSI_WIN_VISTA 0x07 #define ACPI_OSI_WINSRV_2008 0x08 #define ACPI_OSI_WIN_VISTA_SP1 0x09 -#define ACPI_OSI_WIN_7 0x0A +#define ACPI_OSI_WIN_VISTA_SP2 0x0A +#define ACPI_OSI_WIN_7 0x0B #define ACPI_ALWAYS_ILLEGAL 0x00 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[] = { {"Windows 2006", NULL, 0, ACPI_OSI_WIN_VISTA}, /* Windows Vista - Added 03/2006 */ {"Windows 2006.1", NULL, 0, ACPI_OSI_WINSRV_2008}, /* Windows Server 2008 - Added 09/2009 */ {"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 */ /* Feature Group Strings */ |