]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
wireless: move regulatory_init to .init.text
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Jun 2010 07:38:55 +0000 (09:38 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Jun 2010 19:11:13 +0000 (15:11 -0400)
regulatory_init is only called by cfg80211_init which is in .init.text,
too.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/wireless/reg.c
net/wireless/reg.h

index 8f0d97dd3109c54cd85fe01095308171d34d9f01..994c7c5f071b53b969506c8962626d6597f1faa3 100644 (file)
@@ -2630,7 +2630,7 @@ out:
        mutex_unlock(&reg_mutex);
 }
 
-int regulatory_init(void)
+int __init regulatory_init(void)
 {
        int err = 0;
 
@@ -2676,7 +2676,7 @@ int regulatory_init(void)
        return 0;
 }
 
-void regulatory_exit(void)
+void /* __init_or_exit */ regulatory_exit(void)
 {
        struct regulatory_request *reg_request, *tmp;
        struct reg_beacon *reg_beacon, *btmp;
index b26224a9f3bc2ab2ea28d19a3a2ebbc2f5b2a765..c4695d07af23fd3852e8398787205d46a7b0d54c 100644 (file)
@@ -10,7 +10,7 @@ int regulatory_hint_user(const char *alpha2);
 
 void reg_device_remove(struct wiphy *wiphy);
 
-int regulatory_init(void);
+int __init regulatory_init(void);
 void regulatory_exit(void);
 
 int set_regdom(const struct ieee80211_regdomain *rd);