diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-29 19:24:10 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-29 19:24:10 -0400 |
| commit | 9b546e571b94cacccf1091cc9cc0bd8a6a207a66 (patch) | |
| tree | fd50ef5eae6b8283e26926fa5d664f7e1cd88920 /drivers/gpu/drm/i915/intel_lvds.c | |
| parent | 2c1756b12edc19fdd75c833699cb752e1bbb641e (diff) | |
| parent | cda2bb78c24de7674eafa3210314dc75bed344a6 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index b28f7bd9f88a..2e8ddfcba40c 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c | |||
| @@ -690,6 +690,14 @@ static const struct dmi_system_id intel_no_lvds[] = { | |||
| 690 | }, | 690 | }, |
| 691 | { | 691 | { |
| 692 | .callback = intel_no_lvds_dmi_callback, | 692 | .callback = intel_no_lvds_dmi_callback, |
| 693 | .ident = "Dell OptiPlex FX170", | ||
| 694 | .matches = { | ||
| 695 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 696 | DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex FX170"), | ||
| 697 | }, | ||
| 698 | }, | ||
| 699 | { | ||
| 700 | .callback = intel_no_lvds_dmi_callback, | ||
| 693 | .ident = "AOpen Mini PC", | 701 | .ident = "AOpen Mini PC", |
| 694 | .matches = { | 702 | .matches = { |
| 695 | DMI_MATCH(DMI_SYS_VENDOR, "AOpen"), | 703 | DMI_MATCH(DMI_SYS_VENDOR, "AOpen"), |