Merge branch 'for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / iommu / of_iommu.c

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index af499aea0a1a24ed154e35016c868a40df8497c4..57f23eaaa2f9a4625874839a598b65c1bfb95090 100644 (file)
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -174,7 +174,7 @@ err_put_node:
        return NULL;
 }
 
-void __init of_iommu_init(void)
+static int __init of_iommu_init(void)
 {
        struct device_node *np;
        const struct of_device_id *match, *matches = &__iommu_of_table;
@@ -186,4 +186,7 @@ void __init of_iommu_init(void)
                        pr_err("Failed to initialise IOMMU %s\n",
                                of_node_full_name(np));
        }
+
+       return 0;
 }
+postcore_initcall_sync(of_iommu_init);