git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
pci.h
diff --git
a/arch/ia64/include/asm/pci.h
b/arch/ia64/include/asm/pci.h
index
73b5f78
..
127dd7b
100644
(file)
--- a/
arch/ia64/include/asm/pci.h
+++ b/
arch/ia64/include/asm/pci.h
@@
-139,7
+139,7
@@
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
return channel ? isa_irq_to_vector(15) : isa_irq_to_vector(14);
}
-#ifdef CONFIG_
DMAR
+#ifdef CONFIG_
INTEL_IOMMU
extern void pci_iommu_alloc(void);
#endif
#endif /* _ASM_IA64_PCI_H */