xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_bios.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 001c535687d8588873037ee5363d0a709f44b418
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Aug 5 17:14:48 2008 -0400

    IGP: fix typo in IGP quirk handling

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index a4181aa..b9adf28 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -453,10 +453,9 @@ static void RADEONApplyLegacyQuirks(ScrnInfoPtr pScrn, int index)
 	 info->ChipFamily == CHIP_FAMILY_RS480) &&
 	info->BiosConnector[index].ddc_i2c.mask_clk_reg == RADEON_GPIO_CRT2_DDC) {
 	info->BiosConnector[index].ddc_i2c = legacy_setup_i2c_bus(RADEON_GPIO_MONID);
-    }
-    if ((info->ChipFamily == CHIP_FAMILY_RS400 ||
-	 info->ChipFamily == CHIP_FAMILY_RS480) &&
-	info->BiosConnector[index].ddc_i2c.mask_clk_reg == RADEON_GPIO_MONID) {
+    } else if ((info->ChipFamily == CHIP_FAMILY_RS400 ||
+		info->ChipFamily == CHIP_FAMILY_RS480) &&
+	       info->BiosConnector[index].ddc_i2c.mask_clk_reg == RADEON_GPIO_MONID) {
 	info->BiosConnector[index].ddc_i2c.valid = TRUE;
 	info->BiosConnector[index].ddc_i2c.mask_clk_mask = (0x20 << 8);
 	info->BiosConnector[index].ddc_i2c.mask_data_mask = 0x80;