Differential D9436 Diff 24994 x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h

Changeset View

Standalone View

	From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001			From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
	From: Dave Airlie <airlied@redhat.com>			From: Dave Airlie <airlied@redhat.com>
	Date: Mon, 22 Sep 2014 10:56:02 +1000			Date: Mon, 22 Sep 2014 10:56:02 +1000
	Subject: don't use PCITAG in struct anymore			Subject: don't use PCITAG in struct anymore


	diff --git a/src/voodoo.h b/src/voodoo.h			--- src/voodoo.h.orig 2012-07-17 05:21:17 UTC
	index bfed497..c3eb64e 100644
	--- src/voodoo.h
	+++ src/voodoo.h			+++ src/voodoo.h
	@@ -23,7 +23,9 @@ typedef struct {			@@ -23,7 +23,9 @@ typedef struct {

	Bool Voodoo2; /* Set if Voodoo2 */			Bool Voodoo2; /* Set if Voodoo2 */
	pciVideoPtr PciInfo; /* PCI data */			pciVideoPtr PciInfo; /* PCI data */
	+#ifndef XSERVER_LIBPCIACCESS			+#ifndef XSERVER_LIBPCIACCESS
	PCITAG PciTag;			PCITAG PciTag;
	+#endif			+#endif
	CARD32 PhysBase;			CARD32 PhysBase;

	CARD32 Width; /* Current width */			CARD32 Width; /* Current width */
	--
	cgit v0.10.2