From 77d0b0ecfa3c67ff8d11e773a7f083721cf4c6d7 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 3 Oct 2008 16:53:08 -0400
Subject: [PATCH] Remove unused pciNumBuses

---
 hw/xfree86/loader/xf86sym.c          | 3 ---
 hw/xfree86/os-support/bus/Pci.c      | 1 -
 hw/xfree86/os-support/bus/bsd_pci.c  | 1 -
 hw/xfree86/os-support/bus/ix86Pci.c  | 2 --
 hw/xfree86/os-support/bus/linuxPci.c | 1 -
 hw/xfree86/os-support/bus/xf86Pci.h  | 2 --
 6 files changed, 10 deletions(-)

diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index e64068a7e..4fc83f219 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -838,9 +838,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
     /* Globals from xf86Configure.c */
     SYMVAR(ConfiguredMonitor)
 
-    /* Pci.c */
-    SYMVAR(pciNumBuses)
-
     /* modes */
     SYMVAR(xf86CrtcConfigPrivateIndex)
     SYMFUNC(xf86CrtcConfigInit)
diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index 734e7090c..5dccd39dc 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -139,7 +139,6 @@
 /* Global data */
 
 pciBusInfo_t *pciBusInfo = NULL;
-_X_EXPORT int pciNumBuses = 0;     /* Actual number of PCI buses */
 
 _X_EXPORT ADDRESS
 pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr)
diff --git a/hw/xfree86/os-support/bus/bsd_pci.c b/hw/xfree86/os-support/bus/bsd_pci.c
index 3bd9d1565..7becc0a17 100644
--- a/hw/xfree86/os-support/bus/bsd_pci.c
+++ b/hw/xfree86/os-support/bus/bsd_pci.c
@@ -79,7 +79,6 @@ xf86MapLegacyIO(struct pci_device *dev)
 void
 bsdPciInit(void)
 {
-    pciNumBuses = 1;
     pciBusInfo = &bsd_pci;
 
     xf86InitVidMem();
diff --git a/hw/xfree86/os-support/bus/ix86Pci.c b/hw/xfree86/os-support/bus/ix86Pci.c
index 80bac32bc..a279363d9 100644
--- a/hw/xfree86/os-support/bus/ix86Pci.c
+++ b/hw/xfree86/os-support/bus/ix86Pci.c
@@ -474,13 +474,11 @@ void
 ix86PciInit()
 {
     /* Initialize pciBusInfo */
-    pciNumBuses    = 1;
     pciBusInfo     = &ix86Pci0;
 
     /* Make sure that there is a PCI bus present. */
     ix86PciSelectCfgmech();
     if (ix86Pci0.configMech == PCI_CFG_MECH_UNKNOWN) {
-	pciNumBuses    = 0;
 	pciBusInfo     = NULL;
     }
 }
diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index bbc591798..4a48632f7 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -114,7 +114,6 @@ linuxPciInit(void)
 	   we'll need a fallback for 2.0 kernels here */
 	return;
     }
-    pciNumBuses    = 1;
     pciBusInfo	   = &linuxPci0;
 }
 
diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h
index 2b8a4f76b..3a73678b3 100644
--- a/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/hw/xfree86/os-support/bus/xf86Pci.h
@@ -255,8 +255,6 @@ ADDRESS	      pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr);
 PCITAG	      pciTag(int busnum, int devnum, int funcnum);
 Bool xf86scanpci(void);
 
-extern int pciNumBuses;
-
 /* Domain access functions.  Some of these probably shouldn't be public */
 pointer xf86MapDomainMemory(int ScreenNum, int Flags, struct pci_device *dev,
     ADDRESS Base, unsigned long Size);