diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-26 14:46:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-26 14:46:41 -0500 |
| commit | 62c8003ecb973986958e9dade4a7e598349caf48 (patch) | |
| tree | 0e831639cd6449c2955234cfc37ef46481c788d1 /drivers/net/wireless/mwifiex/main.h | |
| parent | e4cb3ff9311e0817e65cda7bc53898348aab7527 (diff) | |
| parent | ec816087e8978b74c1bd5fae0e335dd97d964e9f (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.h')
| -rw-r--r-- | drivers/net/wireless/mwifiex/main.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index db57dd430e92..1b3cfc821940 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h @@ -371,7 +371,6 @@ struct wps { struct mwifiex_roc_cfg { u64 cookie; struct ieee80211_channel chan; - enum nl80211_channel_type chan_type; }; struct mwifiex_adapter; @@ -1018,7 +1017,6 @@ int mwifiex_get_ver_ext(struct mwifiex_private *priv); int mwifiex_remain_on_chan_cfg(struct mwifiex_private *priv, u16 action, struct ieee80211_channel *chan, - enum nl80211_channel_type *channel_type, unsigned int duration); int mwifiex_set_bss_role(struct mwifiex_private *priv, u8 bss_role); |