diff options
Diffstat (limited to 'src/i810_driver.c')
| -rw-r--r-- | src/i810_driver.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/i810_driver.c b/src/i810_driver.c index 22cbbde9..71405090 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -67,10 +67,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. /* * These are X and server generic header files. */ +#include "xorgVersion.h" #include "xf86.h" #include "xf86_OSproc.h" +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,7,0,0,0) #include "xf86Resources.h" #include "xf86RAC.h" +#endif #include "xf86cmap.h" #include "compiler.h" #include "mibstore.h" @@ -721,10 +724,11 @@ I810PreInit(ScrnInfoPtr pScrn, int flags) pI810->PciTag = pciTag(pI810->PciInfo->bus, pI810->PciInfo->device, pI810->PciInfo->func); #endif - +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,7,0,0,0) if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone)) return FALSE; pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; @@ -1155,9 +1159,11 @@ I810PreInit(ScrnInfoPtr pScrn, int flags) #endif /* We won't be using the VGA access after the probe */ +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,7,0,0,0) I810SetMMIOAccess(pI810); xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr); +#endif return TRUE; } |