diff --git a/[refs] b/[refs]
index dc50b282c8e3..69588a66c928 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05f25abcf6043952fb2a2d98735dec58ba1fcadb
+refs/heads/master: 25c8e03bdb769dfe2381f8b7942f05b0eb4bdf31
diff --git a/trunk/drivers/spi/amba-pl022.c b/trunk/drivers/spi/amba-pl022.c
index 80613abe961d..4c37c4e28647 100644
--- a/trunk/drivers/spi/amba-pl022.c
+++ b/trunk/drivers/spi/amba-pl022.c
@@ -1983,7 +1983,7 @@ static int __init pl022_init(void)
 	return amba_driver_register(&pl022_driver);
 }
 
-module_init(pl022_init);
+subsys_initcall(pl022_init);
 
 static void __exit pl022_exit(void)
 {