Make driver backwards compatible for server 1.6.x.

Commit Message

Matthias Hopf July 22, 2011, 1:46 p.m. UTC

---
 src/intel_module.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

Patch

diff --git a/src/intel_module.c b/src/intel_module.c
index cd9c1a3..1e02cca 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -39,6 +39,9 @@ 
 #include "sna/sna_module.h"
 
 #include <xf86drmMode.h>
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,6,99,0,0)
+#include <xf86Resources.h>
+#endif
 
 static struct intel_device_info *chipset_info;
 
@@ -322,7 +325,11 @@  static Bool intel_pci_probe(DriverPtr		driver,
 	for (i = 0; i < ARRAY_SIZE(_intel_chipsets); i++) {
 		intel_pci_chipsets[i].numChipset = intel_chipsets[i].token;
 		intel_pci_chipsets[i].PCIid = intel_chipsets[i].token;
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,6,99,0,0)
+		intel_pci_chipsets[i].resList = RES_SHARED_VGA;
+#else
 		intel_pci_chipsets[i].dummy = NULL;
+#endif
 	}
 
 	scrn = xf86ConfigPciEntity(NULL, 0, entity_num, intel_pci_chipsets,