Merge tag 'lsk-v4.4-16.07-android'

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-highbank / highbank.c

diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
index 6050a14faee6f327799fb1f815755f96c37cd4d1..6b01f02dcb9cdba860fd7e2b78712a2ee99e36b3 100644 (file)
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@ -110,7 +110,7 @@ static int highbank_platform_notifier(struct notifier_block *nb,
        if (of_property_read_bool(dev->of_node, "dma-coherent")) {
                val = readl(sregs_base + reg);
                writel(val | 0xff01, sregs_base + reg);
-               set_dma_ops(dev, &arm_coherent_dma_ops);
+               arch_set_dma_ops(dev, &arm_coherent_dma_ops);
        }
 
        return NOTIFY_OK;