diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 11:41:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 11:41:27 -0500 |
| commit | 597049ccd729e80c5eff7d907beeb58d908aac6f (patch) | |
| tree | 49e6ffd8838ed00923876fa3b1ed8a145444fd1a /include/asm-ia64/pci.h | |
| parent | d3143e71a95fe504c3d2d4a3b7aac126a588b1ac (diff) | |
| parent | e0b874df14052489e6408125903dba96b4dd7baa (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
via82cxxx/pata_via: correct PCI_DEVICE_ID_VIA_SATA_EIDE ID and add support for CX700 and 8237S
ide: unregister idepnp driver on unload
ide: add missing __init tags to IDE PCI host drivers
ia64: add pci_get_legacy_ide_irq()
ide/generic: Jmicron has its own drivers now
atiixp.c: add cable detection support for ATI IDE
atiixp.c: sb600 ide only has one channel
atiixp.c: remove unused code
jmicron: fix warning
ide: update MAINTAINERS entry
Diffstat (limited to 'include/asm-ia64/pci.h')
| -rw-r--r-- | include/asm-ia64/pci.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h index 556f53fa44cb..5160233bbfac 100644 --- a/include/asm-ia64/pci.h +++ b/include/asm-ia64/pci.h | |||
| @@ -167,4 +167,10 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res) | |||
| 167 | 167 | ||
| 168 | #define pcibios_scan_all_fns(a, b) 0 | 168 | #define pcibios_scan_all_fns(a, b) 0 |
| 169 | 169 | ||
| 170 | #define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ | ||
| 171 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | ||
| 172 | { | ||
| 173 | return channel ? 15 : 14; | ||
| 174 | } | ||
| 175 | |||
| 170 | #endif /* _ASM_IA64_PCI_H */ | 176 | #endif /* _ASM_IA64_PCI_H */ |