From 866cab67fa3f7d6e38a91fe7affa1fe2e8170bf4 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Sun, 9 Aug 2009 13:50:53 +0200 Subject: [PATCH] --- yaml --- r: 157171 b: refs/heads/master c: 19e1f888c681d9f71ae0a814902d334eac1911dd h: refs/heads/master i: 157169: 654adc2ad16ea9e51c0bab5a1dc2591754448c35 157167: c1b764e393f48563f2deb315885458a32cdc1154 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_sdvo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3eaa7a0631ad..5c4df1c08ff7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc5e5718acd7f7d000d913e619562767863610bf +refs/heads/master: 19e1f888c681d9f71ae0a814902d334eac1911dd diff --git a/trunk/drivers/gpu/drm/i915/intel_sdvo.c b/trunk/drivers/gpu/drm/i915/intel_sdvo.c index 5371d9332554..95ca0acc4945 100644 --- a/trunk/drivers/gpu/drm/i915/intel_sdvo.c +++ b/trunk/drivers/gpu/drm/i915/intel_sdvo.c @@ -1458,7 +1458,7 @@ intel_sdvo_multifunc_encoder(struct intel_output *intel_output) (SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1)) caps++; if (sdvo_priv->caps.output_flags & - (SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_SVID0)) + (SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_SVID1)) caps++; if (sdvo_priv->caps.output_flags & (SDVO_OUTPUT_CVBS0 | SDVO_OUTPUT_CVBS1))