summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2008-11-06 23:40:34 +0100
committerMatthieu Herrb <matthieu.herrb@laas.fr>2008-11-06 23:40:34 +0100
commit7ae731c269a13613eed5ee8bef6cb9b6e82b74c6 (patch)
tree57f1c4837c681367ae44cbd57337c65a12478499
parent31509152757643b32f42fe0a21d3b00137540e40 (diff)
Fix build on alpha.
-rw-r--r--src/sis_driver.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 1f03227..5d0f51f 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -7331,11 +7331,12 @@ SISMapMem(ScrnInfoPtr pScrn)
xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
"Unable to map IO dense aperture. %s (%d)\n",
strerror (err), err);
-#endif
+ }
+#endif /* XSERVER_LIBPCIACCESS */
}
pSiS->IOBaseDense = pSiSEnt->IOBaseDense;
- } else
-#endif
+ } else {
+#endif /* SISDUALHEAD */
#ifndef XSERVER_LIBPCIACCESS
pSiS->IOBaseDense = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
pSiS->PciTag, pSiS->IOAddress, (pSiS->mmioSize * 1024));
@@ -7351,8 +7352,11 @@ SISMapMem(ScrnInfoPtr pScrn)
xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
"Unable to map IO dense aperture. %s (%d)\n",
strerror (err), err);
+ }
+#endif /* XSERVER_LIBPCIACCESS */
+#ifdef SISDUALHEAD
+ }
#endif
-
if(pSiS->IOBaseDense == NULL) {
SISErrorLog(pScrn, "Could not map MMIO dense area\n");
return FALSE;