From 1bb24e34a22302e584c030c0110bada2f221e4d3 Mon Sep 17 00:00:00 2001
From: matthieu <matthieu@openbsd.org>
Date: Sun, 23 Aug 2015 17:44:33 +0000
Subject: [PATCH] Merge from upstreams in preparation for xserver 1.17

---
 driver/xf86-video-voodoo/src/voodoo.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/driver/xf86-video-voodoo/src/voodoo.h b/driver/xf86-video-voodoo/src/voodoo.h
index bfed4975a..c3eb64e72 100644
--- a/driver/xf86-video-voodoo/src/voodoo.h
+++ b/driver/xf86-video-voodoo/src/voodoo.h
@@ -23,7 +23,9 @@ typedef struct {
   
   Bool		      Voodoo2;		/* Set if Voodoo2 */
   pciVideoPtr	      PciInfo;		/* PCI data */
+#ifndef XSERVER_LIBPCIACCESS
   PCITAG	      PciTag;
+#endif
   CARD32	      PhysBase;
   
   CARD32	      Width;		/* Current width */