diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-11 14:24:55 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-11 14:24:55 -0400 |
| commit | cc755896a4274f11283bca32d1d658203844057a (patch) | |
| tree | 218970ece71df99f686b9416b7fd88b921690ebb /drivers/net/wireless/libertas | |
| parent | d250fe91ae129bff0968e685cc9c466d3a5e3482 (diff) | |
| parent | 9459d59fbf0bc82ff4c804679fa8bc22788eca63 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/ath/ar9170/main.c
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/cfg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c index ce7bec402a3..9d5d3ccf08c 100644 --- a/drivers/net/wireless/libertas/cfg.c +++ b/drivers/net/wireless/libertas/cfg.c | |||
| @@ -79,6 +79,7 @@ static const u32 cipher_suites[] = { | |||
| 79 | 79 | ||
| 80 | 80 | ||
| 81 | static int lbs_cfg_set_channel(struct wiphy *wiphy, | 81 | static int lbs_cfg_set_channel(struct wiphy *wiphy, |
| 82 | struct net_device *netdev, | ||
| 82 | struct ieee80211_channel *chan, | 83 | struct ieee80211_channel *chan, |
| 83 | enum nl80211_channel_type channel_type) | 84 | enum nl80211_channel_type channel_type) |
| 84 | { | 85 | { |