diff options
| author |   Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2007-02-28 01:42:19 +0900 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2007-03-04 19:02:32 +0000 |
| commit | 69f282765735b1df5e27b373e64e5238caca8c49 (patch) | |
| tree | f5139ea1b20c68aff42d9a953b79a773cc7615aa /arch | |
| parent | [MIPS] SNI: Fix mc146818_decode_year (diff) | |
| download | linux-dev-69f282765735b1df5e27b373e64e5238caca8c49.tar.xz linux-dev-69f282765735b1df5e27b373e64e5238caca8c49.zip | |
[MIPS] jmr3927: build fix
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/pci/fixup-jmr3927.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/mips/pci/fixup-jmr3927.c b/arch/mips/pci/fixup-jmr3927.c index f8696081c5b1..6e72d213f4cd 100644 --- a/arch/mips/pci/fixup-jmr3927.c +++ b/arch/mips/pci/fixup-jmr3927.c @@ -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; -} |