Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[karo-tx-linux.git] / drivers / of / device.c

diff --git a/drivers/of/device.c b/drivers/of/device.c
index e5f47cec75f34e046b15efbc5bcdc50073eff5c0..fd5cfad7c4030e58bb817c4b2a56c49b674a1eba 100644 (file)
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -88,7 +88,7 @@ void of_dma_configure(struct device *dev, struct device_node *np)
        int ret;
        bool coherent;
        unsigned long offset;
-       struct iommu_ops *iommu;
+       const struct iommu_ops *iommu;
 
        /*
         * Set default coherent_dma_mask to 32 bit.  Drivers are expected to