From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Fri, 18 Jun 2010 07:38:55 +0000 (+0200)
Subject: wireless: move regulatory_init to .init.text
X-Git-Tag: v2.6.36-rc1~571^2~107^2~189
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2fcc9f731b598a6c70dca277776c66c9cf9d7a3b;p=platform%2Fkernel%2Flinux-stable.git

wireless: move regulatory_init to .init.text

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>
---

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 8f0d97d..994c7c5 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -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;
diff --git a/net/wireless/reg.h b/net/wireless/reg.h
index b26224a..c4695d0 100644
--- a/net/wireless/reg.h
+++ b/net/wireless/reg.h
@@ -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);