1 files changed, 15 insertions, 9 deletions

diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c
index ef69c0c8282..4892fbb54eb 100644
--- a/arch/unicore32/kernel/pci.c
+++ b/arch/unicore32/kernel/pci.c
@@ -21,6 +21,7 @@
 #include <linux/io.h>
 
 static int debug_pci;
+static int use_firmware;
 
 #define CONFIG_CMD(bus, devfn, where)   \
         (0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3))
@@ -154,6 +155,14 @@ void __init puv3_pci_adjust_zones(unsigned long *zone_size,
         zhole_size[0] = 0;
 }
 
+void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)
+{
+        if (debug_pci)
+                printk(KERN_DEBUG "PCI: Assigning IRQ %02d to %s\n",
+                                irq, pci_name(dev));
+        pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
+}
+
 /*
  * If the bus contains any of these devices, then we must not turn on
  * parity checking of any kind.
@@ -167,7 +176,7 @@ static inline int pdev_bad_for_parity(struct pci_dev *dev)
  * pcibios_fixup_bus - Called after each bus is probed,
  * but before its children are examined.
  */
-void pcibios_fixup_bus(struct pci_bus *bus)
+void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 {
         struct pci_dev *dev;
         u16 features = PCI_COMMAND_SERR
@@ -250,7 +259,9 @@ void pcibios_fixup_bus(struct pci_bus *bus)
         printk(KERN_INFO "PCI: bus%d: Fast back to back transfers %sabled\n",
                 bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis");
 }
+#ifdef CONFIG_HOTPLUG
 EXPORT_SYMBOL(pcibios_fixup_bus);
+#endif
 
 static int __init pci_common_init(void)
 {
@@ -265,7 +276,7 @@ static int __init pci_common_init(void)
 
         pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq);
 
-        if (!pci_has_flag(PCI_PROBE_ONLY)) {
+        if (!use_firmware) {
                 /*
                  * Size the bridge windows.
                  */
@@ -286,23 +297,18 @@ static int __init pci_common_init(void)
 }
 subsys_initcall(pci_common_init);
 
-char * __init pcibios_setup(char *str)
+char * __devinit pcibios_setup(char *str)
 {
         if (!strcmp(str, "debug")) {
                 debug_pci = 1;
                 return NULL;
         } else if (!strcmp(str, "firmware")) {
-                pci_add_flags(PCI_PROBE_ONLY);
+                use_firmware = 1;
                 return NULL;
         }
         return str;
 }
 
-void pcibios_set_master(struct pci_dev *dev)
-{
-        /* No special bus mastering setup handling */
-}
-
 /*
  * From arch/i386/kernel/pci-i386.c:
  *