summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchel Humpherys <mitchelh@codeaurora.org>2015-04-01 17:35:40 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:11:02 -0700
commitdc97584f5a56fd01bdb218f7dd96d26bb5f21ad7 (patch)
tree971c136cbe9327e92a9e37e4f5c7977a3a6db89f
parent4bf45874e84c7506ca4d3a230576ec1964bc61db (diff)
iommu/arm-smmu: make iommu_ops non-const
In preparation for the forthcoming flurry of cherry-picks, match things up with the 3.14 fork point by making the arm_smmu_ops variable non-const. With this in place we should be able to cleanly cherry-pick everything from the 3.14 fork point to the end of the msm-3.14 branch. Change-Id: Ifa9d786e27be6d182edfecc1c05e033bc931cbd0 Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
-rw-r--r--drivers/iommu/arm-smmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 60558f794922..9c40a915c166 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1644,7 +1644,7 @@ static void arm_smmu_remove_device(struct device *dev)
iommu_group_remove_device(dev);
}
-static const struct iommu_ops arm_smmu_ops = {
+static struct iommu_ops arm_smmu_ops = {
.capable = arm_smmu_capable,
.domain_init = arm_smmu_domain_init,
.domain_destroy = arm_smmu_domain_destroy,