Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/arch/mips/pci/fixup-atlas.c b/arch/mips/pci/fixup-atlas.c
index c6cd6e9cdfbc8d4b29dc804f173e8cfbc8de596a..506e883a8c7132d1e1f720551ce236f4ba81652d 100644 (file)
--- a/arch/mips/pci/fixup-atlas.c
+++ b/arch/mips/pci/fixup-atlas.c
@@ -58,7 +58,7 @@ static char irq_tab[][5] __initdata = {
        {0,     0,      0,      0,      0 }     /* 21: Unused */
 };
 
-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)
 {
        return irq_tab[slot][pin];
 }
@@ -77,12 +77,12 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
  * code, but it is better than nothing...
  */
 
-static void atlas_saa9730_base_fixup (struct pci_dev *pdev)
+static void atlas_saa9730_base_fixup(struct pci_dev *pdev)
 {
        extern void *saa9730_base;
        if (pdev->bus == 0 && PCI_SLOT(pdev->devfn) == 19)
-               (void) pci_read_config_dword (pdev, 0x14, (u32 *)&saa9730_base);
-       printk ("saa9730_base = %x\n", saa9730_base);
+               (void) pci_read_config_dword(pdev, 0x14, (u32 *)&saa9730_base);
+       printk("saa9730_base = %x\n", saa9730_base);
 }
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA9730,