aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-11-15 14:04:22 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-11-15 14:04:22 -0500
commit72724382d3c9caab1d85e54080d338b854f10dd3 (patch)
treea55045e2987edcbdc65cee9a3f610119eec002c0
parenteceab4ac8d9dd8955e0961fd7477664c087a9017 (diff)
[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>
-rw-r--r--arch/arm/common/sa1111.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 7b07acb03f3b..39a6eea300a2 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -1266,7 +1266,7 @@ static void __exit sa1111_exit(void)
1266 bus_unregister(&sa1111_bus_type); 1266 bus_unregister(&sa1111_bus_type);
1267} 1267}
1268 1268
1269module_init(sa1111_init); 1269subsys_initcall(sa1111_init);
1270module_exit(sa1111_exit); 1270module_exit(sa1111_exit);
1271 1271
1272MODULE_DESCRIPTION("Intel Corporation SA1111 core driver"); 1272MODULE_DESCRIPTION("Intel Corporation SA1111 core driver");