From cd3a131730e87537d4f7b699dcc898039df228a2 Mon Sep 17 00:00:00 2001
From: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
Date: Tue, 26 Jul 2011 16:23:54 +0200
Subject: [PATCH] --- yaml --- r: 262542 b: refs/heads/master c:
 b066254fee2b0b4d1323295f8ae34c9442222165 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/i915/intel_lvds.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3d6630858a86..eebea7a4eedb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0e3fb482105c65ce6f5480a86092e966a29ed79
+refs/heads/master: b066254fee2b0b4d1323295f8ae34c9442222165
diff --git a/trunk/drivers/gpu/drm/i915/intel_lvds.c b/trunk/drivers/gpu/drm/i915/intel_lvds.c
index b28f7bd9f88a..2e8ddfcba40c 100644
--- a/trunk/drivers/gpu/drm/i915/intel_lvds.c
+++ b/trunk/drivers/gpu/drm/i915/intel_lvds.c
@@ -688,6 +688,14 @@ static const struct dmi_system_id intel_no_lvds[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Studio Hybrid 140g"),
 		},
 	},
+	{
+		.callback = intel_no_lvds_dmi_callback,
+		.ident = "Dell OptiPlex FX170",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex FX170"),
+		},
+	},
 	{
 		.callback = intel_no_lvds_dmi_callback,
 		.ident = "AOpen Mini PC",