From: Zhang, Yanmin Date: Mon, 12 Feb 2007 06:12:01 +0000 (+0800) Subject: [IA64] pci_get_legacy_ide_irq should return irq (not GSI) X-Git-Tag: v2.6.21-rc4~51^2~6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8621235b2ede3276e9862540f0188e40471a99f7;p=linux-2.6-omap-h63xx.git [IA64] pci_get_legacy_ide_irq should return irq (not GSI) Function pci_get_legacy_ide_irq is incorrect on ia64. It should return irq vector instead of GSI. The fixed number 14 and 15 are just GSI. Signed-off-by: Zhang Yanmin Signed-off-by: Tony Luck --- diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h index 5160233bbfa..5a5d1c2ce39 100644 --- a/include/asm-ia64/pci.h +++ b/include/asm-ia64/pci.h @@ -9,6 +9,7 @@ #include #include +#include /* * Can be used to override the logic in pci_scan_bus for skipping already-configured bus @@ -170,7 +171,7 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res) #define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) { - return channel ? 15 : 14; + return channel ? isa_irq_to_vector(15) : isa_irq_to_vector(14); } #endif /* _ASM_IA64_PCI_H */