diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index 8929ef2a4..a53f34494 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -238,11 +238,6 @@ pciInit(void)
 #endif
 
 	ARCH_PCI_INIT();
-#if defined(ARCH_PCI_OS_INIT)
-	if (pciNumBuses <= 0) {
-	    ARCH_PCI_OS_INIT();
-	}
-#endif
     }
 }
 
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index bc322acf7..59ad6a1e8 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -216,11 +216,12 @@
 # endif
 # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper
 #elif defined(__i386__) || defined(i386)
-# define ARCH_PCI_INIT ix86PciInit
-# define INCLUDE_XF86_NO_DOMAIN
 # if defined(linux)
-#  define ARCH_PCI_OS_INIT linuxPciInit
+#  define ARCH_PCI_INIT linuxPciInit
+# else
+#  define ARCH_PCI_INIT ix86PciInit
 # endif
+# define INCLUDE_XF86_NO_DOMAIN
 #elif defined(__mc68000__)
 # if defined(linux)
 #  define ARCH_PCI_INIT linuxPciInit
@@ -270,13 +271,12 @@
 #elif defined(__amd64__) || defined(__amd64)
 # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #  define ARCH_PCI_INIT freebsdPciInit
+# elif defined(linux)
+#  define ARCH_PCI_INIT linuxPciInit
 # else
 #  define ARCH_PCI_INIT ix86PciInit
 # endif
 # define INCLUDE_XF86_NO_DOMAIN
-# if defined(linux)
-#  define ARCH_PCI_OS_INIT linuxPciInit
-# endif
 #endif
 
 #ifndef ARCH_PCI_INIT
@@ -286,9 +286,6 @@
 #undef INCLUDE_XF86_NO_DOMAIN
 
 extern void ARCH_PCI_INIT(void);
-#if defined(ARCH_PCI_OS_INIT)
-extern void ARCH_PCI_OS_INIT(void);
-#endif
 
 #if defined(XF86SCANPCI_WRAPPER)
 typedef enum {
diff --git a/hw/xfree86/os-support/bus/ix86Pci.c b/hw/xfree86/os-support/bus/ix86Pci.c
index 8b528ed32..3ed4f1422 100644
--- a/hw/xfree86/os-support/bus/ix86Pci.c
+++ b/hw/xfree86/os-support/bus/ix86Pci.c
@@ -281,12 +281,7 @@ void ix86PciSelectCfgmech(void)
      * We rely on xf86Info.pciFlags to tell which mechanisms to try....
      */
     switch (xf86Info.pciFlags) {
-
 	case PCIOsConfig:
-#ifdef ARCH_PCI_OS_INIT
-	    return;
-#endif
-	    
 	case PCIProbe1:
 	    if (!xf86EnableIO())
 		return;