summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-08-20 15:36:57 -0700
committerIan Romanick <idr@us.ibm.com>2007-08-20 15:36:57 -0700
commitf4ef39d53d5a67942707507814fef4ad466dc909 (patch)
treeea24e2f04ab84f1b125af86b91d928722cc001b4
parent707d3adbc7d9ee918d6c70083f51ad851ce68852 (diff)
Fix compile error introduced by merge.
-rw-r--r--src/mga_driver.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mga_driver.c b/src/mga_driver.c
index 2c9c6ef..008cd55 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -1484,7 +1484,14 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
if (pMga->is_G200SE) {
/* Disable MTRR support on PCIe systems */
+#if 1
+ uint32_t temp;
+
+ pci_device_cfg_read_u32(pMga->PciInfo, & temp, 0xDC);
+#else
CARD32 temp = pciReadLong(pMga->PciTag, 0xDC);
+#endif
+
if ((temp & 0x0000FF00) != 0x0) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disabling MTRR support.\n");
pScrn->options = xf86ReplaceBoolOption(pScrn->options, "MTRR", FALSE);