diff options
| -rw-r--r-- | src/fbdev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/fbdev.c b/src/fbdev.c index 9e66095..306d59c 100644 --- a/src/fbdev.c +++ b/src/fbdev.c @@ -27,8 +27,10 @@ #include "afb.h" #endif +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" #include "xf86RAC.h" +#endif #include "fbdevhw.h" @@ -413,6 +415,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); +#ifndef XSERVER_LIBPCIACCESS pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; /* XXX Is this right? Can probably remove RAC_FB */ pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; @@ -423,7 +426,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) "xf86RegisterResources() found resource conflicts\n"); return FALSE; } - +#endif /* open device */ if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev"))) return FALSE; |