Merge branch 'acpi-blacklist'

* acpi-blacklist: ACPI / blacklist: blacklist Win8 OSI for Dell Vostro 3546

Merge branch 'acpi-blacklist'
* acpi-blacklist: ACPI / blacklist: blacklist Win8 OSI for Dell Vostro 3546
a9b70711 · Rafael J. Wysocki · 206c5f60 · 22258464 · a9b70711
Commit a9b70711 authored Nov 14, 2014 by Rafael J. Wysocki
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

drivers/acpi/blacklist.c drivers/acpi/blacklist.c +8 -0

No files found.
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -290,6 +290,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
 		    DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3446"),
 		},
 	},
+	{
+	.callback = dmi_disable_osi_win8,
+	.ident = "Dell Vostro 3546",
+	.matches = {
+		    DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+		    DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3546"),
+		},
+	},

 	/*
 	 * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.