diff options
Diffstat (limited to 'src/alp_driver.c')
| -rw-r--r-- | src/alp_driver.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/alp_driver.c b/src/alp_driver.c index a14a5e8..c5c531d 100644 --- a/src/alp_driver.c +++ b/src/alp_driver.c @@ -36,8 +36,10 @@ /* This driver needs to be modified to not use vgaHW for multihead operation */ #include "vgaHW.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86RAC.h" #include "xf86Resources.h" +#endif /* All drivers initialising the SW cursor need this */ #include "mipointer.h" @@ -695,7 +697,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) (unsigned long)pCir->IOAddress); } else xf86DrvMsg(pScrn->scrnIndex, from1, "Not Using MMIO\n"); - + +#ifndef XSERVER_LIBPCIACCESS /* * XXX Check if this is correct */ @@ -712,6 +715,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) "xf86RegisterResources() found resource conflicts\n"); return FALSE; } +#endif if (!xf86LoadSubModule(pScrn, "i2c")) { AlpFreeRec(pScrn); |