diff options
| author | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2011-03-13 19:40:48 +0200 |
|---|---|---|
| committer | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2011-03-13 19:40:48 +0200 |
| commit | 069a09b6eccdec0733072c0da3ec2ec5dd533ee7 (patch) | |
| tree | 4e0e0982f5985366227ab248dbb49e45fc6bba2e | |
| parent | 35beba050461b2b1053ffd0b8ae84a4c305fb72f (diff) | |
Updated resources for libpciaccess
| -rw-r--r-- | src/cyrix_driver.c | 6 | ||||
| -rw-r--r-- | src/cyrix_shadow.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c index f404e52..e22a75f 100644 --- a/src/cyrix_driver.c +++ b/src/cyrix_driver.c @@ -68,7 +68,9 @@ #include "vgaHW.h" #include "xf86DDC.h" #include "xf86RAC.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#endif #include "compiler.h" #include "xf86int10.h" #include "vbe.h" @@ -660,7 +662,9 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flags) /* This is the general case */ for (i = 0; i<pScrn->numEntities; i++) { pCyrix->pEnt = xf86GetEntityInfo(pScrn->entityList[i]); - if (pCyrix->pEnt->resources) return FALSE; + #ifndef XSERVER_LIBPCIACCESS + if (pCyrix->pEnt->resources) return FALSE; + #endif pCyrix->Chipset = pCyrix->pEnt->chipset; pScrn->chipset = (char *)xf86TokenToString(CYRIXChipsets, pCyrix->pEnt->chipset); diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c index a914429..afb928d 100644 --- a/src/cyrix_shadow.c +++ b/src/cyrix_shadow.c @@ -11,7 +11,9 @@ #include "xf86.h" #include "xf86_OSproc.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#endif #include "xf86PciInfo.h" #include "xf86Pci.h" #include "cyrix.h" |