summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2009-05-06 12:04:48 -0400
committerAdam Jackson <ajax@redhat.com>2009-05-06 12:04:48 -0400
commitbf6aee62b891d4305cb96f8a37e625e5cf7c1504 (patch)
tree68a3c80560fd1abd485a6136727519331bc253e8
parent626af26098ab5d0823bf1d6c08157b4c89ec578a (diff)
Remove redundant MGAuseI2C macro
-rw-r--r--src/mga_driver.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/mga_driver.c b/src/mga_driver.c
index e229984..0851824 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -636,13 +636,9 @@ static const char *driSymbols[] = {
};
#endif
-#define MGAuseI2C 1
-
static const char *ddcSymbols[] = {
"xf86DoEDID_DDC1",
-#if MGAuseI2C
"xf86DoEDID_DDC2",
-#endif
"xf86PrintEDID",
"xf86SetDDCproperties",
NULL
@@ -1428,7 +1424,6 @@ MGAdoDDC(ScrnInfoPtr pScrn)
} else
return NULL;
-#if MGAuseI2C
/* - DDC can use I2C bus */
/* Load I2C if we have the code to use it */
if (pMga->i2cInit) {
@@ -1441,7 +1436,6 @@ MGAdoDDC(ScrnInfoPtr pScrn)
pMga->DDC_Bus2 = NULL;
}
}
-#endif /* MGAuseI2C */
/* Map the MGA memory and MMIO areas */
if (!MGAMapMem(pScrn))
@@ -1470,7 +1464,6 @@ MGAdoDDC(ScrnInfoPtr pScrn)
/* It is now safe to talk to the card */
-#if MGAuseI2C
/* Initialize I2C buses - used by DDC if available */
if (pMga->i2cInit) {
pMga->i2cInit(pScrn);
@@ -1496,7 +1489,6 @@ MGAdoDDC(ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of I2C Monitor info\n");
}
if (!MonInfo)
-#endif /* MGAuseI2C */
/* Read and output monitor info using DDC1 */
if (pMga->ddc1Read && pMga->DDC1SetSpeed) {
MonInfo = xf86DoEDID_DDC1(pScrn->scrnIndex,
@@ -1520,9 +1512,7 @@ MGAdoDDC(ScrnInfoPtr pScrn)
}
}
}
-#if MGAuseI2C
}
-#endif
/* Restore previous state and unmap MGA memory and MMIO areas */
MGARestore(pScrn);
MGAUnmapMem(pScrn);