diff options
author | Zhang, Yanmin <yanmin_zhang@linux.intel.com> | 2007-02-12 01:12:01 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2007-03-08 13:04:44 -0500 |
commit | 8621235b2ede3276e9862540f0188e40471a99f7 (patch) | |
tree | 2595bb978737b00df1e15a931e0549eb63e13536 /include/asm-ia64 | |
parent | 860abe8f7254208074cef83dc9ebc4d70ae277a9 (diff) |
[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 <yanmin.zhang@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64')
-rw-r--r-- | include/asm-ia64/pci.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h index 5160233bbfac..5a5d1c2ce39d 100644 --- a/include/asm-ia64/pci.h +++ b/include/asm-ia64/pci.h | |||
@@ -9,6 +9,7 @@ | |||
9 | 9 | ||
10 | #include <asm/io.h> | 10 | #include <asm/io.h> |
11 | #include <asm/scatterlist.h> | 11 | #include <asm/scatterlist.h> |
12 | #include <asm/hw_irq.h> | ||
12 | 13 | ||
13 | /* | 14 | /* |
14 | * Can be used to override the logic in pci_scan_bus for skipping already-configured bus | 15 | * 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) | |||
170 | #define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ | 171 | #define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ |
171 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | 172 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) |
172 | { | 173 | { |
173 | return channel ? 15 : 14; | 174 | return channel ? isa_irq_to_vector(15) : isa_irq_to_vector(14); |
174 | } | 175 | } |
175 | 176 | ||
176 | #endif /* _ASM_IA64_PCI_H */ | 177 | #endif /* _ASM_IA64_PCI_H */ |