Merge branch 'bugzilla-102904-workaround' into release

e9e8b4dd · Len Brown · d9a799d1 · 4b1b29bc · e9e8b4dd
Commit e9e8b4dd authored Jun 12, 2010 by Len Brown
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
@@ -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 = {