From dbef62615f38aebf4cdc579e3b26a7e7c719abc4 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Fri, 16 Jun 2006 08:50:49 +0200
Subject: conditionally declare pPCI and PciReg, too

---
 src/atiprobe.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/atiprobe.c b/src/atiprobe.c
index df74a42..da214d4 100644
--- a/src/atiprobe.c
+++ b/src/atiprobe.c
@@ -997,10 +997,8 @@ ATIProbe
     ATIPtr                 pATI, *ATIPtrs = NULL;
     GDevPtr                *GDevs, pGDev;
     pciVideoPtr            pVideo, *xf86PciVideoInfo = xf86GetPciVideoInfo();
-    pciConfigPtr           pPCI;
     ATIGDev                *ATIGDevs = NULL, *pATIGDev;
     ScrnInfoPtr            pScreenInfo;
-    CARD32                 PciReg;
     Bool                   ProbeSuccess = FALSE;
     Bool                   DoRage128 = FALSE, DoRadeon = FALSE;
     int                    i, j, k;
@@ -1008,6 +1006,11 @@ ATIProbe
     int                    Chipset;
     ATIChipType            Chip;
 
+#if !defined(AVOID_NON_PCI) || !defined(AVOID_CPIO)
+    pciConfigPtr           pPCI;
+    CARD32                 PciReg;
+#endif /* AVOID_NON_PCI || AVOID_CPIO */
+
 #ifndef AVOID_NON_PCI
     ATIPtr                 pMach64[3] = {NULL, NULL, NULL};
 #endif
-- 
cgit v1.2.3