diff options
Diffstat (limited to 'src/i830_driver.c')
| -rw-r--r-- | src/i830_driver.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 04033b8d..3f0d7df4 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -173,10 +173,13 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdio.h> #include <errno.h> +#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 "xf86Priv.h" #include "xf86cmap.h" #include "compiler.h" @@ -1838,12 +1841,14 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) pI830->PciInfo->func); #endif +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,7,0,0,0) if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) { PreInitCleanup(pScrn); return FALSE; } pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; +#endif pScrn->monitor = pScrn->confScreen->monitor; pScrn->progClock = TRUE; pScrn->rgbBits = 8; @@ -1967,9 +1972,11 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) I830UnmapMMIO(pScrn); /* We won't be using the VGA access after the probe. */ +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,7,0,0,0) I830SetMMIOAccess(pI830); xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr); +#endif } #if defined(XF86DRI) |