summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorTiago Vignatti <vignatti@c3sl.ufpr.br>2008-02-25 18:14:08 -0300
committerTiago Vignatti <vignatti@c3sl.ufpr.br>2008-02-25 18:14:08 -0300
commitc46f7b62d2bf9f35937cfef98325ed904895396a (patch)
tree731983e577f70bf9ae1e651059f820446e633428 /hw
parenta9050d54249ed9f54c6fe59143b846c9c7548f59 (diff)
Fine, we don't need pciInit() anymore. Nuke, nuke, nuke...
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/os-support/bus/Pci.c27
1 files changed, 10 insertions, 17 deletions
diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index 8b21fad59..064533c77 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -148,22 +148,6 @@ _X_EXPORT int pciNumBuses = 0; /* Actual number of PCI buses */
int pciMaxBusNum = MAX_PCI_BUSES;
-/*
- * pciInit - choose correct platform/OS specific PCI init routine
- */
-static void
-pciInit(void)
-{
- /* XXX */
-#if defined(DEBUGPCI)
- if (DEBUGPCI >= xf86Verbose) {
- xf86Verbose = DEBUGPCI;
- }
-#endif
-
- ARCH_PCI_INIT();
-}
-
_X_EXPORT ADDRESS
pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr)
{
@@ -194,7 +178,16 @@ xf86scanpci(void)
Bool success = FALSE;
success = (pci_system_init() == 0);
- pciInit();
+
+ /* XXX */
+#if defined(DEBUGPCI)
+ if (DEBUGPCI >= xf86Verbose) {
+ xf86Verbose = DEBUGPCI;
+ }
+#endif
+
+ /* choose correct platform/OS specific PCI init routine */
+ ARCH_PCI_INIT();
return success;
}