Merge ARM fixes

[linux-2.6] / include / asm-mips / pci.h

diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h
index 87ced6a5b5dd392837aa350e3c615ef614f06419..3eea3ba0fca5ec7f2353a0555c0dc47c2800637d 100644 (file)
--- a/include/asm-mips/pci.h
+++ b/include/asm-mips/pci.h
@@ -6,7 +6,6 @@
 #ifndef _ASM_PCI_H
 #define _ASM_PCI_H
 
-#include <linux/config.h>
 #include <linux/mm.h>
 
 #ifdef __KERNEL__
@@ -33,6 +32,7 @@ struct pci_controller {
        unsigned long mem_offset;
        struct resource *io_resource;
        unsigned long io_offset;
+       unsigned long io_map_base;
 
        unsigned int index;
        /* For compatibility with current (as of July 2003) pciutils
@@ -40,6 +40,11 @@ struct pci_controller {
        unsigned int need_domain_info;
 
        int iommu;
+
+       /* Optional access methods for reading/writing the bus number
+          of the PCI controller */
+       int (*get_busno)(void);
+       void (*set_busno)(int busno);
 };
 
 /*
@@ -183,4 +188,10 @@ static inline void pcibios_add_platform_entries(struct pci_dev *dev)
 /* Do platform specific device initialization at pci_enable_device() time */
 extern int pcibios_plat_dev_init(struct pci_dev *dev);
 
+/* Chances are this interrupt is wired PC-style ...  */
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+       return channel ? 15 : 14;
+}
+
 #endif /* _ASM_PCI_H */