xf86-video-r128: Branch 'master'

[Jeremy Huddleston]

 src/atipcirename.h |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 67aaa4698586d75242627b7ce8f4815eeb08f853
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Oct 31 11:56:33 2011 -0700

    Build fix for older servers (error: conflicting types for 'pciTag')
    
    /usr/include/xorg/xf86Pci.h:254:25: note: previous declaration of 'pciTag' was here
    
    Reported-by: Johannes Obermayr <johannesobermayr at gmx.de>
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/src/atipcirename.h b/src/atipcirename.h
index 7d9d3a8..e65ae3c 100644
--- a/src/atipcirename.h
+++ b/src/atipcirename.h
@@ -34,6 +34,10 @@ enum region_type {
     REGION_IO 
 };
 
+#include "xf86Module.h"
+
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
+
 #if (defined(__alpha__) || defined(__ia64__)) && defined (linux)
 #define PCI_DOM_MASK    0x01fful
 #else
@@ -55,6 +59,7 @@ pciTag(int busnum, int devnum, int funcnum)
 
 	return tag;
 }
+#endif /* GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 */
 
 #ifndef XSERVER_LIBPCIACCESS