diff options
| author | Len Brown <len.brown@intel.com> | 2010-07-22 18:18:18 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-07-22 18:18:18 -0400 |
| commit | be48b11573952b467676b24de87d637e33339e7d (patch) | |
| tree | ec2e746cd1f409b54fe2ec809d197170d1107a03 /drivers | |
| parent | 27568d8e5f7a038795dff997a906f775084f927a (diff) | |
| parent | 096486eece7ef38cf1ee46b704482c75c4010fb1 (diff) | |
Merge branch 'bugzilla-102904-workaround' into release
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/blacklist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index 01381be05e96..2bb28b9d91c4 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c | |||
| @@ -214,7 +214,7 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { | |||
| 214 | .ident = "Sony VGN-SR290J", | 214 | .ident = "Sony VGN-SR290J", |
| 215 | .matches = { | 215 | .matches = { |
| 216 | DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), | 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 | { |