Skip to content

Commit

Permalink
Merge branch 'bugzilla-102904-workaround' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
Len Brown committed Jun 12, 2010
2 parents d9a799d + 4b1b29b commit e9e8b4d
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/acpi/blacklist.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit e9e8b4d

Please sign in to comment.