summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/blacklist.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-09-28 23:48:49 +0200
committerLen Brown <len.brown@intel.com>2010-09-28 23:48:49 +0200
commitbbb7030fbb6469c46974c4736a5f90d12102f299 (patch)
tree2e9b04fab8996d5da6435ba1dc6864eb0c5e20cd /drivers/acpi/blacklist.c
parentalpha: fix usp value in multithreaded coredumps (diff)
downloadlinux-bbb7030fbb6469c46974c4736a5f90d12102f299.tar.xz
linux-bbb7030fbb6469c46974c4736a5f90d12102f299.zip
ACPI: expand Vista blacklist to include SP1 and SP2
When we claim incompatibility with Vista, include both Vista SP1 and SP2. https://bugzilla.kernel.org/show_bug.cgi?id=12641 Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/blacklist.c')
-rw-r--r--drivers/acpi/blacklist.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 2bb28b9d91c4..3eda6c040400 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -183,6 +183,8 @@ static int __init dmi_disable_osi_vista(const struct dmi_system_id *d)
{
printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
acpi_osi_setup("!Windows 2006");
+ acpi_osi_setup("!Windows 2006 SP1");
+ acpi_osi_setup("!Windows 2006 SP2");
return 0;
}
static int __init dmi_disable_osi_win7(const struct dmi_system_id *d)