---

yaml --- r: 179897 b: refs/heads/master c: 79b7dcb h: refs/heads/master i: 179895: f58c7d4 v: v3
git-mirror · Jan 15, 2010 · 204bfcb · 204bfcb
1 parent ba4192c
commit 204bfcb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c974dc21898f9abbcb5e47ae9ddb7e6b473de2e
+refs/heads/master: 79b7dcb2af7da728819cf060b94ce8c9ead36f7e
diff --git a/trunk/drivers/gpu/drm/drm_edid.c b/trunk/drivers/gpu/drm/drm_edid.c
@@ -633,8 +633,7 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
 		return NULL;
 	}
 	if (!(pt->misc & DRM_EDID_PT_SEPARATE_SYNC)) {
-		printk(KERN_WARNING "integrated sync not supported\n");
-		return NULL;
+		printk(KERN_WARNING "composite sync not supported\n");
 	}
 
 	/* it is incorrect if hsync/vsync width is zero */