diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-10-17 16:52:22 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-10-17 16:52:22 -0400 |
| commit | fe393164c529f72def1952fb66c11732d0984d78 (patch) | |
| tree | 56e4425988e90cb9608e95844f577cd18009618c /arch/ia64/include/asm/pci.h | |
| parent | 22ca532a4d137545244fdff0b687325fd4e13eae (diff) | |
| parent | 62fdd7678a26efadd6ac5c2869543caff77d2df0 (diff) | |
Pull vtd-iommu into release branch
Conflicts:
arch/ia64/kernel/acpi.c
Diffstat (limited to 'arch/ia64/include/asm/pci.h')
| -rw-r--r-- | arch/ia64/include/asm/pci.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h index 0149097b736d..645ef06ddaa4 100644 --- a/arch/ia64/include/asm/pci.h +++ b/arch/ia64/include/asm/pci.h | |||
| @@ -164,4 +164,7 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | |||
| 164 | return channel ? isa_irq_to_vector(15) : isa_irq_to_vector(14); | 164 | return channel ? isa_irq_to_vector(15) : isa_irq_to_vector(14); |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | #ifdef CONFIG_DMAR | ||
| 168 | extern void pci_iommu_alloc(void); | ||
| 169 | #endif | ||
| 167 | #endif /* _ASM_IA64_PCI_H */ | 170 | #endif /* _ASM_IA64_PCI_H */ |