diff --git a/[refs] b/[refs]
index 352b75001480..f00469645949 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 719bb84017fcfc949a77e150dd5b045e90a4ebc9
+refs/heads/master: cf38aca520741ccdc1365efbef5a4cab33b0a4ac
diff --git a/trunk/drivers/mtd/ubi/build.c b/trunk/drivers/mtd/ubi/build.c
index 8fd85e32506a..34977039850c 100644
--- a/trunk/drivers/mtd/ubi/build.c
+++ b/trunk/drivers/mtd/ubi/build.c
@@ -1261,7 +1261,7 @@ static int __init ubi_init(void)
 	ubi_err("UBI error: cannot initialize UBI, error %d", err);
 	return err;
 }
-module_init(ubi_init);
+late_initcall(ubi_init);
 
 static void __exit ubi_exit(void)
 {