Let the alpha specific code compile. Untested.

This commit is contained in:
matthieu 2008-11-04 07:01:05 +00:00
parent ed43e25d4d
commit d0fa9a1ef8

View File

@ -7337,11 +7337,12 @@ SISMapMem(ScrnInfoPtr pScrn)
xf86DrvMsg (pScrn->scrnIndex, X_ERROR, xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
"Unable to map IO dense aperture. %s (%d)\n", "Unable to map IO dense aperture. %s (%d)\n",
strerror (err), err); strerror (err), err);
#endif }
#endif /* XSERVER_LIBPCIACCESS */
} }
pSiS->IOBaseDense = pSiSEnt->IOBaseDense; pSiS->IOBaseDense = pSiSEnt->IOBaseDense;
} else } else {
#endif #endif /* SISDUALHEAD */
#ifndef XSERVER_LIBPCIACCESS #ifndef XSERVER_LIBPCIACCESS
pSiS->IOBaseDense = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, pSiS->IOBaseDense = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
pSiS->PciTag, pSiS->IOAddress, (pSiS->mmioSize * 1024)); pSiS->PciTag, pSiS->IOAddress, (pSiS->mmioSize * 1024));
@ -7357,8 +7358,11 @@ SISMapMem(ScrnInfoPtr pScrn)
xf86DrvMsg (pScrn->scrnIndex, X_ERROR, xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
"Unable to map IO dense aperture. %s (%d)\n", "Unable to map IO dense aperture. %s (%d)\n",
strerror (err), err); strerror (err), err);
}
#endif /* XSERVER_LIBPCIACCESS */
#ifdef SISDUALHEAD
}
#endif #endif
if(pSiS->IOBaseDense == NULL) { if(pSiS->IOBaseDense == NULL) {
SISErrorLog(pScrn, "Could not map MMIO dense area\n"); SISErrorLog(pScrn, "Could not map MMIO dense area\n");
return FALSE; return FALSE;