diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-14 15:17:17 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-14 15:17:17 +0100 |
| commit | a9b70711896043d5913c6cf10785dc7d13aed27d (patch) | |
| tree | 9f596264336f9ef01644d326a5a58664930e7430 /drivers | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
| parent | 222584647f2821c4d68421c1d07c89b375d501b2 (diff) | |
| download | linux-a9b70711896043d5913c6cf10785dc7d13aed27d.tar.bz2 | |
Merge branch 'acpi-blacklist'
* acpi-blacklist:
ACPI / blacklist: blacklist Win8 OSI for Dell Vostro 3546
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/blacklist.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index ed122e17636e..7556e7c4a055 100644 --- 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. |