xf86-video-intel: src/intel_module.c

[Stefan Dirsch]

 src/intel_module.c |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit b213f6e876f29cbcaccffeeb733726be4c91529e
Author: Stefan Dirsch <sndirsch at suse.de>
Date:   Sat Jan 14 05:43:33 2012 +0100

    Make driver backwards compatible for server 1.6.x.
    
    Signed-off-by: Stefan Dirsch <sndirsch at suse.de>

diff --git a/src/intel_module.c b/src/intel_module.c
index fb98a04..4a0d980 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -38,6 +38,10 @@
 #include "legacy/legacy.h"
 #include "sna/sna_module.h"
 
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,6,99,0,0)
+#include <xf86Resources.h>
+#endif
+
 static struct intel_device_info *chipset_info;
 
 static const struct intel_device_info intel_i81x_info = {
@@ -322,7 +326,11 @@ static Bool intel_pci_probe(DriverPtr		driver,
 	for (i = 0; i < NUM_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,