ia64: Reorganize initialization sequence a bit.

diff --git a/arch/ia64/kernel/pci.c b/arch/ia64/kernel/pci.c
index 54d1a093da1ecdb8e2b0a0059b893d046956321d..8f17f53efed8eff822d33fb581e1333cf4d01c0e 100644 (file)
--- a/arch/ia64/kernel/pci.c
+++ b/arch/ia64/kernel/pci.c
@@ -49,9 +49,6 @@ extern void ia64_mca_check_errors( void );
 
 struct pci_fixup pcibios_fixups[1];
 
-struct pci_ops *pci_root_ops;
-
-
 /*
  * Low-level SAL-based PCI configuration access functions. Note that SAL
  * calls are already serialized (via sal_lock), so we don't need another
@@ -106,13 +103,10 @@ struct pci_ops pci_sal_ops = {
        .write =        pci_sal_write,
 };
 
-
-/*
- * Initialization. Uses the SAL interface
- */
+struct pci_ops *pci_root_ops = &pci_sal_ops;   /* default to SAL */
 
 struct pci_bus *
-pcibios_scan_root(int bus)
+pcibios_scan_root (int bus)
 {
        struct list_head *list = NULL;
        struct pci_bus *pci_bus = NULL;
@@ -127,35 +121,21 @@ pcibios_scan_root(int bus)
        }
 
        printk("PCI: Probing PCI hardware on bus (%02x)\n", bus);
-
        return pci_scan_bus(bus, pci_root_ops, NULL);
 }
 
-void __init
-pcibios_config_init (void)
-{
-       if (pci_root_ops)
-               return;
-
-       printk("PCI: Using SAL to access configuration space\n");
-
-       pci_root_ops = &pci_sal_ops;
-
-       return;
-}
-
 static int __init
 pcibios_init (void)
 {
 #      define PCI_BUSES_TO_SCAN 255
        int i = 0;
 
+acpi_init();   /* hackedy hack hack... */
+
 #ifdef CONFIG_IA64_MCA
        ia64_mca_check_errors();    /* For post-failure MCA error logging */
 #endif
 
-       pcibios_config_init();
-
        platform_pci_fixup(0);  /* phase 0 fixups (before buses scanned) */
 
        printk("PCI: Probing PCI hardware\n");