From 71e3e2d4e3b2a2c538fe6f1cea41f442fdb8d756 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri, 4 Aug 2006 20:39:50 +0100
Subject: [PATCH] Fix a problem creating the I2C bus for the SDVOC interface,
 due to a name match with SDVOB.

Bus names must be unique.
---
 src/i830_sdvo.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 9a18f578..fe0c41a6 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -858,7 +858,10 @@ I830SDVOInit(ScrnInfoPtr pScrn, int output_index, CARD32 output_device)
 	xfree(sdvo);
 	return NULL;
     }
-    ddcbus->BusName = "SDVO DDC Bus";
+    if (output_device == SDVOB)
+        ddcbus->BusName = "SDVOB DDC Bus";
+    else
+        ddcbus->BusName = "SDVOC DDC Bus";
     ddcbus->scrnIndex = i2cbus->scrnIndex;
     ddcbus->I2CGetByte = I830SDVODDCI2CGetByte;
     ddcbus->I2CPutByte = I830SDVODDCI2CPutByte;