diff options
| author | Tilman Sauerbeck <tilman@code-monkey.de> | 2006-06-16 08:50:49 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-06-23 09:59:40 +1000 |
| commit | dbef62615f38aebf4cdc579e3b26a7e7c719abc4 (patch) | |
| tree | a9a96699dca7ae48d9da7b515bf5848b43dd9623 /src | |
| parent | a01c01787cfbe3706ae7747cde1657abd79ecdaa (diff) | |
conditionally declare pPCI and PciReg, too
Diffstat (limited to 'src')
| -rw-r--r-- | src/atiprobe.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/atiprobe.c b/src/atiprobe.c index df74a42b..da214d4f 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 |