diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-12 15:21:05 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-12 15:21:05 -0400 |
| commit | d07d152892aadd8dc3209ecef6788dfc83475676 (patch) | |
| tree | 0f140aa244ddc2c52494155342298cef64fc8456 /drivers/net/wireless/ath/ath6kl/cfg80211.h | |
| parent | 2f8684ce7a47c91da7e0ccba2686277c103d02b6 (diff) | |
| parent | 685fb72b63faf09a767cc28332545f5830b91be8 (diff) | |
| download | linux-d07d152892aadd8dc3209ecef6788dfc83475676.tar.bz2 | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/iwmc3200wifi/cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/cfg80211.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.h b/drivers/net/wireless/ath/ath6kl/cfg80211.h index b992046a1b0e..56b1ebe79812 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.h +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.h @@ -25,9 +25,9 @@ enum ath6kl_cfg_suspend_mode { ATH6KL_CFG_SUSPEND_SCHED_SCAN, }; -struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name, - enum nl80211_iftype type, - u8 fw_vif_idx, u8 nw_type); +struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, char *name, + enum nl80211_iftype type, + u8 fw_vif_idx, u8 nw_type); void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq, enum wmi_phy_mode mode); void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted); |