Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[~andy/linux] / include / asm-generic / pci.h

diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h
index c36a77d3bf44473b603b9c7d2a4749521f708a79..515c6e2e3218e5c193275e6b420ac3312218cae6 100644 (file)
--- a/include/asm-generic/pci.h
+++ b/include/asm-generic/pci.h
@@ -52,4 +52,12 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 }
 #endif /* HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ */
 
+/*
+ * By default, assume that no iommu is in use and that the PCI
+ * space is mapped to address physical 0.
+ */
+#ifndef PCI_DMA_BUS_IS_PHYS
+#define PCI_DMA_BUS_IS_PHYS    (1)
 #endif
+
+#endif /* _ASM_GENERIC_PCI_H */