git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://github.com/ericvh/linux
[pandora-kernel.git]
/
net
/
wireless
/
core.c
diff --git
a/net/wireless/core.c
b/net/wireless/core.c
index
c148651
..
220f3bd
100644
(file)
--- a/
net/wireless/core.c
+++ b/
net/wireless/core.c
@@
-582,7
+582,7
@@
int wiphy_register(struct wiphy *wiphy)
}
/* set up regulatory info */
-
wiphy_update_regulatory
(wiphy, NL80211_REGDOM_SET_BY_CORE);
+
regulatory_update
(wiphy, NL80211_REGDOM_SET_BY_CORE);
list_add_rcu(&rdev->list, &cfg80211_rdev_list);
cfg80211_rdev_list_generation++;