diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-08-16 16:13:05 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-08-16 16:13:05 +0000 |
| commit | b6db87897aa2871e146535b5f11b298bb38978d7 (patch) | |
| tree | 7df6be9c7ffc757f76f1a553ca975764d9dd4393 /driver/xf86-video-cirrus/src/alp_xaa.c | |
| parent | c1c60f60fadac54bb031e23e020c2a7d32db63c9 (diff) | |
Update to xf86-video-cirrus 1.5.1
Diffstat (limited to 'driver/xf86-video-cirrus/src/alp_xaa.c')
| -rw-r--r-- | driver/xf86-video-cirrus/src/alp_xaa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/driver/xf86-video-cirrus/src/alp_xaa.c b/driver/xf86-video-cirrus/src/alp_xaa.c index 7a96e1a75..b3ddd64c2 100644 --- a/driver/xf86-video-cirrus/src/alp_xaa.c +++ b/driver/xf86-video-cirrus/src/alp_xaa.c @@ -9,7 +9,6 @@ #include "compiler.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "vgaHW.h" @@ -17,6 +16,7 @@ #define _ALP_PRIVATE_ #include "alp.h" +#ifdef HAVE_XAA_H #define WAIT outb(pCir->PIOReg, 0x31); \ while(inb(pCir->PIOReg + 1) & pCir->chip.alp->waitMsk){}; #define WAIT_1 outb(pCir->PIOReg, 0x31); \ @@ -588,7 +588,7 @@ AlpAccelEngineInit(ScrnInfoPtr pScrn) Bool AlpXAAInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); CirPtr pCir = CIRPTR(pScrn); AlpPtr pAlp = ALPPTR(pCir); XAAInfoRecPtr XAAPtr; @@ -684,4 +684,4 @@ AlpXAAInit(ScreenPtr pScreen) return TRUE; } - +#endif |