diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:29 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:29 +1000 |
| commit | fe00991326bbf6f0944543fda3856bedaa916a09 (patch) | |
| tree | 19cb2452370a975a4e69debe9d0a0e909280da96 /src | |
| parent | 16ea2bb46c9acc881f66a1f498d63586071aa9b7 (diff) | |
| download | xorg-driver-xf86-video-fbdev-fe00991326bbf6f0944543fda3856bedaa916a09.tar.gz | |
fbdev: update for resources/RAC API removal
Diffstat (limited to 'src')
| -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; |