diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-12 00:58:01 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-12 00:58:01 -0400 |
| commit | e9e8b4dd142da3b6cbf301ba922804d6cdc31a17 (patch) | |
| tree | b3989a95d9fed058356963ebcc23b4e70e2aeb9a /drivers/acpi | |
| parent | d9a799d197da16fcfb1e872e82ee6cdf7fe8f7ab (diff) | |
| parent | 4b1b29bc8801badd243694add02262e0955dde1b (diff) | |
Merge branch 'bugzilla-102904-workaround' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/blacklist.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index 2815df66f6f7..01381be05e96 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 = { | |||
| 218 | }, | 218 | }, |
| 219 | }, | 219 | }, |
| 220 | { | 220 | { |
| 221 | .callback = dmi_disable_osi_vista, | ||
| 222 | .ident = "VGN-NS50B_L", | ||
| 223 | .matches = { | ||
| 224 | DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), | ||
| 225 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NS50B_L"), | ||
| 226 | }, | ||
| 227 | }, | ||
| 228 | { | ||
| 221 | .callback = dmi_disable_osi_win7, | 229 | .callback = dmi_disable_osi_win7, |
| 222 | .ident = "ASUS K50IJ", | 230 | .ident = "ASUS K50IJ", |
| 223 | .matches = { | 231 | .matches = { |