vserver 1.9.5.x5

[linux-2.6.git] / include / asm-ppc64 / pci.h

diff --git a/include/asm-ppc64/pci.h b/include/asm-ppc64/pci.h
index 032a2e6..144878b 100644 (file)
--- a/include/asm-ppc64/pci.h
+++ b/include/asm-ppc64/pci.h
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/dma-mapping.h>
+#include <asm/machdep.h>
 #include <asm/scatterlist.h>
 #include <asm/io.h>
 #include <asm/prom.h>
@@ -20,6 +21,8 @@
 #define PCIBIOS_MIN_IO         0x1000
 #define PCIBIOS_MIN_MEM                0x10000000
 
+struct pci_dev;
+
 #ifdef CONFIG_PPC_ISERIES
 #define pcibios_scan_all_fns(a, b)     0
 #else
@@ -36,7 +39,13 @@ static inline void pcibios_penalize_isa_irq(int irq)
        /* We don't do dynamic PCI IRQ allocation */
 }
 
-struct pci_dev;
+#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+       if (ppc_md.pci_get_legacy_ide_irq)
+               return ppc_md.pci_get_legacy_ide_irq(dev, channel);
+       return channel ? 15 : 14;
+}
 
 #define HAVE_ARCH_PCI_MWI 1
 static inline int pcibios_prep_mwi(struct pci_dev *dev)
@@ -229,6 +238,8 @@ remap_bus_range(struct pci_bus *bus);
 extern void
 pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus);
 
+extern struct pci_controller *init_phb_dynamic(struct device_node *dn);
+
 extern int pci_read_irq_line(struct pci_dev *dev);
 
 extern void pcibios_add_platform_entries(struct pci_dev *dev);