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 | a22b16c0dc757c940461f26bc6e1802b53e860c5 (patch) | |
| tree | a6b43e796fda3f666222b567a4a8b2647b379d75 /src/lx_driver.c | |
| parent | 810dd8f15c40271b75bb8a124709eadb5e4c36a8 (diff) | |
geode: update for resources/RAC API removal
Diffstat (limited to 'src/lx_driver.c')
| -rw-r--r-- | src/lx_driver.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lx_driver.c b/src/lx_driver.c index 107b354..a78778a 100644 --- a/src/lx_driver.c +++ b/src/lx_driver.c @@ -36,7 +36,9 @@ #include "xf86.h" #include "xf86_OSproc.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#endif #include "xf86i2c.h" #include "xf86Crtc.h" #include "xf86cmap.h" @@ -289,10 +291,10 @@ LXPreInit(ScrnInfoPtr pScrni, int flags) return FALSE; pEnt = xf86GetEntityInfo(pScrni->entityList[0]); - +#ifndef XSERVER_LIBPCIACCESS if (pEnt->resources) return FALSE; - +#endif if (flags & PROBE_DETECT) { GeodeProbeDDC(pScrni, pEnt->index); return TRUE; @@ -570,13 +572,13 @@ LXPreInit(ScrnInfoPtr pScrni, int flags) if (!xf86LoadSubModule(pScrni, "exa")) return FALSE; } - +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrni->scrnIndex, X_ERROR, "Couldn't register the resources.\n"); return FALSE; } - +#endif return TRUE; } |