From 15cde5d3dcc0f69990e9e91f33e71a32e84a3008 Mon Sep 17 00:00:00 2001 From: matthieu Date: Wed, 14 Jul 2010 11:40:19 +0000 Subject: [PATCH] Let the old radeon driver build with xserver 1.8 --- driver/xf86-video-ati/src/radeon_driver.c | 5 ++++- driver/xf86-video-ati/src/radeon_probe.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/driver/xf86-video-ati/src/radeon_driver.c b/driver/xf86-video-ati/src/radeon_driver.c index dbaaa39ea..4eca673a6 100644 --- a/driver/xf86-video-ati/src/radeon_driver.c +++ b/driver/xf86-video-ati/src/radeon_driver.c @@ -94,7 +94,9 @@ #include "xf86_OSproc.h" #include "xf86RAC.h" #include "xf86RandR12.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 7 #include "xf86Resources.h" +#endif #include "xf86cmap.h" #include "vbe.h" @@ -2886,12 +2888,13 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) PCI_DEV_DEV(info->PciInfo), PCI_DEV_FUNC(info->PciInfo)); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 7 if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive)) goto fail; - xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr); pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR; +#endif pScrn->monitor = pScrn->confScreen->monitor; /* Allocate an xf86CrtcConfig */ diff --git a/driver/xf86-video-ati/src/radeon_probe.c b/driver/xf86-video-ati/src/radeon_probe.c index 041bab67f..25d3bcfd4 100644 --- a/driver/xf86-video-ati/src/radeon_probe.c +++ b/driver/xf86-video-ati/src/radeon_probe.c @@ -44,7 +44,9 @@ #include "atipcirename.h" #include "xf86.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 7 #include "xf86Resources.h" +#endif #include "radeon_chipset_gen.h"