Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT

[sfrench/cifs-2.6.git] / arch / mips / txx9 / generic / pci.c

diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c
index 28713274e0ccfed086667422a5fcfe4dd924ae9f..a77698ff2b6f75fb62dd22d8214bf2f957692dc0 100644 (file)
--- a/arch/mips/txx9/generic/pci.c
+++ b/arch/mips/txx9/generic/pci.c
@@ -268,7 +268,7 @@ static int txx9_i8259_irq_setup(int irq)
        return err;
 }
 
-static void quirk_slc90e66_bridge(struct pci_dev *dev)
+static void __init_refok quirk_slc90e66_bridge(struct pci_dev *dev)
 {
        int irq;        /* PCI/ISA Bridge interrupt */
        u8 reg_64;
@@ -331,7 +331,7 @@ static void quirk_slc90e66_ide(struct pci_dev *dev)
         * !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!!
         */
        dat |= 0x01;
-       pci_write_config_byte(dev, regs[i], dat);
+       pci_write_config_byte(dev, 0x5c, dat);
        pci_read_config_byte(dev, 0x5c, &dat);
        printk(KERN_CONT " REG5C %02x", dat);
        printk(KERN_CONT "\n");