From 7207b0b4e879b3bb6836f2f1383df3cd071836f7 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Wed, 15 Aug 2012 09:34:43 +0000 Subject: [PATCH] --- yaml --- r: 329313 b: refs/heads/master c: 32285038f533f5bb4ba4c75de7ade710a836b639 h: refs/heads/master i: 329311: 5e0a5fcab30bf47777888b06289f295772679ca3 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/psb_intel_sdvo.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 02c6d7d3ecc3..b9df03d0fa1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f835bc0fcacc7f4e29890938b1c2faecd07eda9e +refs/heads/master: 32285038f533f5bb4ba4c75de7ade710a836b639 diff --git a/trunk/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/trunk/drivers/gpu/drm/gma500/psb_intel_sdvo.c index a453d94f115c..d35f93ba3a85 100644 --- a/trunk/drivers/gpu/drm/gma500/psb_intel_sdvo.c +++ b/trunk/drivers/gpu/drm/gma500/psb_intel_sdvo.c @@ -1292,7 +1292,6 @@ psb_intel_sdvo_get_analog_edid(struct drm_connector *connector) return drm_get_edid(connector, &dev_priv->gmbus[dev_priv->crt_ddc_pin].adapter); - return NULL; } static enum drm_connector_status