From 2a66818dcacde7fd02f671aa232c6c4e3878155c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Fri, 18 Jun 2010 09:38:55 +0200
Subject: [PATCH] --- yaml --- r: 203254 b: refs/heads/master c:
 2fcc9f731b598a6c70dca277776c66c9cf9d7a3b h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/wireless/reg.c | 4 ++--
 trunk/net/wireless/reg.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 11cb769dd2cd..8a2013e33535 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f884e3879b7a098565e963e771cb342b67b1f5cd
+refs/heads/master: 2fcc9f731b598a6c70dca277776c66c9cf9d7a3b
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 8f0d97dd3109..994c7c5f071b 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -2630,7 +2630,7 @@ void reg_device_remove(struct wiphy *wiphy)
 	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/trunk/net/wireless/reg.h b/trunk/net/wireless/reg.h
index b26224a9f3bc..c4695d07af23 100644
--- a/trunk/net/wireless/reg.h
+++ b/trunk/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);