From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 15 Nov 2005 19:04:22 +0000 (+0000)
Subject: [ARM] Initialise SA1111 core before SA1111 PCMCIA
X-Git-Tag: v2.6.15-rc2~78^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=72724382d3c9caab1d85e54080d338b854f10dd3;p=~emulex%2Finfiniband.git

[ARM] Initialise SA1111 core before SA1111 PCMCIA

This avoids a BUG_ON with kref.c when SA1111 tries to register
a driver with an unregistered bus type.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 7b07acb03f3..39a6eea300a 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -1266,7 +1266,7 @@ static void __exit sa1111_exit(void)
 	bus_unregister(&sa1111_bus_type);
 }
 
-module_init(sa1111_init);
+subsys_initcall(sa1111_init);
 module_exit(sa1111_exit);
 
 MODULE_DESCRIPTION("Intel Corporation SA1111 core driver");