From 204bfcbacedf9a6dbc9b29314310aa52e29e79c5 Mon Sep 17 00:00:00 2001 From: Jerome Glisse Date: Thu, 14 Jan 2010 19:02:20 +0100 Subject: [PATCH] --- yaml --- r: 179897 b: refs/heads/master c: 79b7dcb2af7da728819cf060b94ce8c9ead36f7e h: refs/heads/master i: 179895: f58c7d4b9c7ed3f59725c95775b655dfca0d5ab0 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_edid.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d6290a816565..e8496e75c5f2 100644 --- 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 index defcaf108460..f665b05592f3 100644 --- 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 */