diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 15:04:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 15:04:31 -0700 |
| commit | af4330631cd48987755f1a8d324dc318f60cf16b (patch) | |
| tree | 3c9233e81b450921326da13a7f8abacb58ab1f5e /net/wireless/core.h | |
| parent | 2d6a5e9500103680464a723a4564961675652680 (diff) | |
| parent | 808ff697b357cee54e214efd27921a9ec6461a94 (diff) | |
| download | talos-op-linux-af4330631cd48987755f1a8d324dc318f60cf16b.tar.gz talos-op-linux-af4330631cd48987755f1a8d324dc318f60cf16b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/core.h')
| -rw-r--r-- | net/wireless/core.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index f6c53f5807f4..6acd483a61f8 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -136,7 +136,8 @@ extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv, char *newname); void ieee80211_set_bitrate_flags(struct wiphy *wiphy); -void wiphy_update_regulatory(struct wiphy *wiphy, enum reg_set_by setby); +void wiphy_update_regulatory(struct wiphy *wiphy, + enum nl80211_reg_initiator setby); void cfg80211_bss_expire(struct cfg80211_registered_device *dev); void cfg80211_bss_age(struct cfg80211_registered_device *dev, |
