diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-18 09:38:55 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-18 15:11:13 -0400 |
| commit | 2fcc9f731b598a6c70dca277776c66c9cf9d7a3b (patch) | |
| tree | 028d0d608a6ec31b345054506d4281c30f77a1e2 | |
| parent | f884e3879b7a098565e963e771cb342b67b1f5cd (diff) | |
| download | linux-stable-2fcc9f731b598a6c70dca277776c66c9cf9d7a3b.tar.gz linux-stable-2fcc9f731b598a6c70dca277776c66c9cf9d7a3b.tar.bz2 linux-stable-2fcc9f731b598a6c70dca277776c66c9cf9d7a3b.zip | |
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>
| -rw-r--r-- | net/wireless/reg.c | 4 | ||||
| -rw-r--r-- | net/wireless/reg.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 8f0d97dd3109..994c7c5f071b 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2630,7 +2630,7 @@ out: mutex_unlock(®_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 b26224a9f3bc..c4695d07af23 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); |