From 6f2b923c870b2e0ff2b69f6efa08d57ddb27d56c Mon Sep 17 00:00:00 2001 From: Bob Moore Date: Mon, 18 Oct 2010 08:50:47 +0800 Subject: [PATCH] --- yaml --- r: 217651 b: refs/heads/master c: 23ebbf07068f84b7ed119a0bef4a3f0ebb82c894 h: refs/heads/master i: 217649: 139b4a2c6b3af6858d25d7d2c18a6f87499324a9 217647: 277805c971d0ace6883a9024c040f0b754710570 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/aclocal.h | 3 ++- trunk/drivers/acpi/acpica/utosi.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e00112e10221..7e1545afa4f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34cf66e724a2bf0a406d59b18f5bfeed746d7979 +refs/heads/master: 23ebbf07068f84b7ed119a0bef4a3f0ebb82c894 diff --git a/trunk/drivers/acpi/acpica/aclocal.h b/trunk/drivers/acpi/acpica/aclocal.h index 04ce32272546..1bb18c0d0881 100644 --- a/trunk/drivers/acpi/acpica/aclocal.h +++ b/trunk/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/trunk/drivers/acpi/acpica/utosi.c b/trunk/drivers/acpi/acpica/utosi.c index 0a37950c96aa..18c59a85fdca 100644 --- a/trunk/drivers/acpi/acpica/utosi.c +++ b/trunk/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 */