From 93d421e604a47252f2db6f6bb150d2795e4b15d5 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 11 Sep 2007 12:50:32 +0200
Subject: [PATCH] --- yaml --- r: 65166 b: refs/heads/master c:
 ca9938fea576ebbb8d8c4fbe8a5bcc937e49e1ca h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/net/mac80211/ieee80211.c      | 2 +-
 trunk/net/mac80211/rc80211_simple.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b29f79efb003..17758e03e011 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 136e83d6b8999f4ef680ff9cf2a67e1e1ccbd94e
+refs/heads/master: ca9938fea576ebbb8d8c4fbe8a5bcc937e49e1ca
diff --git a/trunk/net/mac80211/ieee80211.c b/trunk/net/mac80211/ieee80211.c
index 7286c389a4d0..ff2172ffd861 100644
--- a/trunk/net/mac80211/ieee80211.c
+++ b/trunk/net/mac80211/ieee80211.c
@@ -5259,7 +5259,7 @@ static void __exit ieee80211_exit(void)
 }
 
 
-module_init(ieee80211_init);
+subsys_initcall(ieee80211_init);
 module_exit(ieee80211_exit);
 
 MODULE_DESCRIPTION("IEEE 802.11 subsystem");
diff --git a/trunk/net/mac80211/rc80211_simple.c b/trunk/net/mac80211/rc80211_simple.c
index f6780d63b342..17b9f46bbf2b 100644
--- a/trunk/net/mac80211/rc80211_simple.c
+++ b/trunk/net/mac80211/rc80211_simple.c
@@ -431,7 +431,7 @@ static void __exit rate_control_simple_exit(void)
 }
 
 
-module_init(rate_control_simple_init);
+subsys_initcall(rate_control_simple_init);
 module_exit(rate_control_simple_exit);
 
 MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");