X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Fasm-x86_64%2Fpci.h;h=49c5e9280598729000a42e07483fa5f21da2b538;hb=efab03d998da03f67836ffc664b04e0400f85448;hp=2db0620d544912a099181231bc75fc4dfd94976f;hpb=62c4f0a2d5a188f73a94f2cb8ea0dba3e7cf0a7f;p=linux-2.6-omap-h63xx.git

diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h
index 2db0620d544..49c5e928059 100644
--- a/include/asm-x86_64/pci.h
+++ b/include/asm-x86_64/pci.h
@@ -39,8 +39,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
 #include <asm/scatterlist.h>
 #include <linux/string.h>
 #include <asm/page.h>
-#include <linux/dma-mapping.h> /* for have_iommu */
 
+extern void pci_iommu_alloc(void);
 extern int iommu_setup(char *opt);
 
 /* The PCI address space does equal the physical memory
@@ -52,7 +52,7 @@ extern int iommu_setup(char *opt);
  */
 #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
 
-#ifdef CONFIG_GART_IOMMU
+#if defined(CONFIG_IOMMU) || defined(CONFIG_CALGARY_IOMMU)
 
 /*
  * x86-64 always supports DAC, but sometimes it is useful to force