From 81e5b4b697adc69b67c04837d0d8a3ea954ade40 Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Sun, 26 Feb 2012 12:14:14 +0200
Subject: [PATCH] --- yaml --- r: 288036 b: refs/heads/master c:
 435792d93410f008120c4dbab148019a3cc31dbc h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-omap2/mailbox.c | 3 ++-
 trunk/drivers/iommu/omap-iommu.c    | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8e5cab876d67..e71a6e2c2a47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87997aaa1bad1fc37e4ff7eb27850172017017a0
+refs/heads/master: 435792d93410f008120c4dbab148019a3cc31dbc
diff --git a/trunk/arch/arm/mach-omap2/mailbox.c b/trunk/arch/arm/mach-omap2/mailbox.c
index 609ea2ded7e3..a6db1e4f7b6e 100644
--- a/trunk/arch/arm/mach-omap2/mailbox.c
+++ b/trunk/arch/arm/mach-omap2/mailbox.c
@@ -412,7 +412,8 @@ static void __exit omap2_mbox_exit(void)
 	platform_driver_unregister(&omap2_mbox_driver);
 }
 
-module_init(omap2_mbox_init);
+/* must be ready before omap3isp is probed */
+subsys_initcall(omap2_mbox_init);
 module_exit(omap2_mbox_exit);
 
 MODULE_LICENSE("GPL v2");
diff --git a/trunk/drivers/iommu/omap-iommu.c b/trunk/drivers/iommu/omap-iommu.c
index d8edd979d01b..6899dcd02dfa 100644
--- a/trunk/drivers/iommu/omap-iommu.c
+++ b/trunk/drivers/iommu/omap-iommu.c
@@ -1223,7 +1223,8 @@ static int __init omap_iommu_init(void)
 
 	return platform_driver_register(&omap_iommu_driver);
 }
-module_init(omap_iommu_init);
+/* must be ready before omap3isp is probed */
+subsys_initcall(omap_iommu_init);
 
 static void __exit omap_iommu_exit(void)
 {