diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c index 500650a36..87f8e9b0d 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c @@ -11,7 +11,7 @@ * Guy DESBIEF */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.26 2002/01/04 21:22:29 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.28 2002/07/24 01:47:27 tsi Exp $ */ /* All drivers should typically include these */ #include "xf86.h" @@ -542,6 +542,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) pCir = CIRPTR(pScrn); pCir->pScrn = pScrn; + pCir->PIOReg = hwp->PIOOffset + 0x3CE; /* Get the entity, and make sure it is PCI. */ pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); @@ -755,9 +756,9 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) */ if (!pCir->UseMMIO) { pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT | RAC_FB; - xf86SetOperatingState(resVgaMemShared, pCir->pEnt->index,ResUnusedOpr); + xf86SetOperatingState(resVgaMem, pCir->pEnt->index, ResUnusedOpr); } else { - xf86SetOperatingState(RES_SHARED_VGA, pCir->pEnt->index, ResUnusedOpr); + xf86SetOperatingState(resVga, pCir->pEnt->index, ResUnusedOpr); } /* Register the PCI-assigned resources. */ |