linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / ia64 / sn / pci / pcibr / pcibr_provider.c

diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 838c93c..98f716b 100644 (file)
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -74,22 +74,6 @@ static int sal_pcibr_error_interrupt(struct pcibus_info *soft)
        return (int)ret_stuff.v0;
 }
 
-u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus)
-{
-       s64 rc;
-       u16 ioboard;
-       nasid_t nasid = NASID_GET(SN_PCIBUS_BUSSOFT(pci_bus)->bs_base);
-
-       rc = ia64_sn_sysctl_ioboard_get(nasid, &ioboard);
-       if (rc) {
-               printk(KERN_WARNING "ia64_sn_sysctl_ioboard_get failed: %ld\n",
-                      rc);
-               return 0;
-       }
-
-       return ioboard;
-}
-
 /* 
  * PCI Bridge Error interrupt handler.  Gets invoked whenever a PCI 
  * bridge sends an error interrupt.
@@ -139,7 +123,7 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
         * register the bridge's error interrupt handler
         */
        if (request_irq(SGI_PCIASIC_ERROR, (void *)pcibr_error_intr_handler,
-                       IRQF_SHARED, "PCIBR error", (void *)(soft))) {
+                       SA_SHIRQ, "PCIBR error", (void *)(soft))) {
                printk(KERN_WARNING
                       "pcibr cannot allocate interrupt for error handler\n");
        }
@@ -271,4 +255,3 @@ pcibr_init_provider(void)
 
 EXPORT_SYMBOL_GPL(sal_pcibr_slot_enable);
 EXPORT_SYMBOL_GPL(sal_pcibr_slot_disable);
-EXPORT_SYMBOL_GPL(sn_ioboard_to_pci_bus);