Merge branch 'master' into upstream

1 files changed, 9 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c
index 3b5e563c279f..5d84a9ccd103 100644
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
@@ -45,6 +45,15 @@ int mpc83xx_exclude_device(u_char bus, u_char devfn)
         return PCIBIOS_SUCCESSFUL;
 }
 
+void __init mpc83xx_pcibios_fixup(void)
+{
+        struct pci_dev *dev = NULL;
+
+        /* map all the PCI irqs */
+        for_each_pci_dev(dev)
+                pci_read_irq_line(dev);
+}
+
 int __init add_bridge(struct device_node *dev)
 {
         int len;