Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / ia64 / kernel / pci-dma.c

diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index 10a75b5..031abbf 100644 (file)
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
@@ -89,13 +89,6 @@ int iommu_dma_supported(struct device *dev, u64 mask)
 {
        struct dma_mapping_ops *ops = get_dma_ops(dev);
 
-#ifdef CONFIG_PCI
-       if (mask > 0xffffffff && forbid_dac > 0) {
-               dev_info(dev, "Disallowing DAC for device\n");
-               return 0;
-       }
-#endif
-
        if (ops->dma_supported_op)
                return ops->dma_supported_op(dev, mask);