summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-06-12 04:58:01 (GMT)
committerLen Brown <len.brown@intel.com>2010-06-12 04:58:01 (GMT)
commite9e8b4dd142da3b6cbf301ba922804d6cdc31a17 (patch)
treeb3989a95d9fed058356963ebcc23b4e70e2aeb9a /drivers/acpi
parentd9a799d197da16fcfb1e872e82ee6cdf7fe8f7ab (diff)
parent4b1b29bc8801badd243694add02262e0955dde1b (diff)
downloadlinux-e9e8b4dd142da3b6cbf301ba922804d6cdc31a17.tar.xz
Merge branch 'bugzilla-102904-workaround' into release
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/blacklist.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 2815df6..01381be 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -218,6 +218,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
},
},
{
+ .callback = dmi_disable_osi_vista,
+ .ident = "VGN-NS50B_L",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NS50B_L"),
+ },
+ },
+ {
.callback = dmi_disable_osi_win7,
.ident = "ASUS K50IJ",
.matches = {