Commit 069a09b6 authored by Martin-Éric Racine's avatar Martin-Éric Racine
Browse files

Updated resources for libpciaccess

parent 35beba05
......@@ -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);
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment