Merge git://git.infradead.org/battery-2.6

[linux-2.6-omap-h63xx.git] / arch / mips / pci / fixup-rbtx4927.c

diff --git a/arch/mips/pci/fixup-rbtx4927.c b/arch/mips/pci/fixup-rbtx4927.c
index ceeb1860895ad67f5b57d817fd89885d7acf0978..7450c335b387529d16d7c388d88e207629f3dbfd 100644 (file)
--- a/arch/mips/pci/fixup-rbtx4927.c
+++ b/arch/mips/pci/fixup-rbtx4927.c
@@ -79,7 +79,7 @@ static unsigned char backplane_pci_irq[4][4] = {
                                     TX4927_IRQ_IOC_PCIC}
 };
 
-int pci_get_irq(struct pci_dev *dev, int pin)
+static int pci_get_irq(const struct pci_dev *dev, int pin)
 {
        unsigned char irq = pin;
 
@@ -119,7 +119,7 @@ int pci_get_irq(struct pci_dev *dev, int pin)
        return irq;
 }
 
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        unsigned char irq;