Merge from upstreams in preparation for xserver 1.17

2015-08-23 17:44:33 +00:00 · 2015-08-23 17:44:33 +00:00 · 1bb24e34a2
commit 1bb24e34a2
parent 4652b3c87b
1 changed files with 2 additions and 0 deletions
--- 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 */