Merge branch 'bugzilla-102904-workaround' into release

lenb · lenb · commit be48b1157395 · 2010-07-22T18:18:18.000-04:00
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
@@ -214,7 +214,7 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
 	.ident = "Sony VGN-SR290J",
 	.matches = {
 		     DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-		     DMI_MATCH(DMI_PRODUCT_NAME, "Sony VGN-SR290J"),
+		     DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR290J"),
 		},
 	},
 	{

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {`
`214`	`214`	`.ident = "Sony VGN-SR290J",`
`215`	`215`	`.matches = {`
`216`	`216`	`DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),`
`217`		`- DMI_MATCH(DMI_PRODUCT_NAME, "Sony VGN-SR290J"),`
	`217`	`+ DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR290J"),`
`218`	`218`	`},`
`219`	`219`	`},`
`220`	`220`	`{`