diff --git a/[refs] b/[refs] index 3ed2a691b136..3b6e1d40751c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3263263f7091eccab6fdc23f28f09b17c0466629 +refs/heads/master: 5b1d221e6292f9fcf9f12d6c9e94ee9470ee2a24 diff --git a/trunk/include/asm-mips/pci.h b/trunk/include/asm-mips/pci.h index c4d68bebdca6..7f0f120ca07c 100644 --- a/trunk/include/asm-mips/pci.h +++ b/trunk/include/asm-mips/pci.h @@ -187,4 +187,10 @@ static inline void pcibios_add_platform_entries(struct pci_dev *dev) /* Do platform specific device initialization at pci_enable_device() time */ extern int pcibios_plat_dev_init(struct pci_dev *dev); +/* Chances are this interrupt is wired PC-style ... */ +static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) +{ + return channel ? 15 : 14; +} + #endif /* _ASM_PCI_H */