Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats' and...

[firefly-linux-kernel-4.4.55.git] / drivers / pnp / resource.c

diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index a925e6b63d72cff9953672c285210de80c3c488e..b0ecacbe53b191147f4146510ce32b25ab48de70 100644 (file)
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -409,9 +409,9 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
        return 1;
 }
 
+#ifdef CONFIG_ISA_DMA_API
 int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
 {
-#ifndef CONFIG_IA64
        int i;
        struct pnp_dev *tdev;
        struct resource *tres;
@@ -466,11 +466,8 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
        }
 
        return 1;
-#else
-       /* IA64 does not have legacy DMA */
-       return 0;
-#endif
 }
+#endif /* CONFIG_ISA_DMA_API */
 
 unsigned long pnp_resource_type(struct resource *res)
 {