]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[MIPS] jmr3927: build fix
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Tue, 27 Feb 2007 16:42:19 +0000 (01:42 +0900)
committerRalf Baechle <ralf@linux-mips.org>
Sun, 4 Mar 2007 19:02:32 +0000 (19:02 +0000)
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/pci/fixup-jmr3927.c

index f8696081c5b1fd089dc99d0abfc1021af6ec6868..6e72d213f4cd0512461a93c64ce32e84b06fff34 100644 (file)
@@ -38,6 +38,10 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
        unsigned char irq = pin;
 
+       /* SMSC SLC90E66 IDE uses irq 14, 15 (default) */
+       if (dev->vendor == PCI_VENDOR_ID_EFAR &&
+           dev->device == PCI_DEVICE_ID_EFAR_SLC90E66_1)
+               return irq;
        /* IRQ rotation (PICMG) */
        irq--;                  /* 0-3 */
        if (dev->bus->parent == NULL &&
@@ -93,13 +97,3 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
 {
        return 0;
 }
-
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-       /* SMSC SLC90E66 IDE uses irq 14, 15 (default) */
-       if (!(dev->vendor == PCI_VENDOR_ID_EFAR &&
-             dev->device == PCI_DEVICE_ID_EFAR_SLC90E66_1))
-               return pci_get_irq(dev, pin);
-
-       dev->irq = irq;
-}