diff options
author | David S. Miller <davem@davemloft.net> | 2008-09-03 14:32:33 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-03 14:32:33 -0700 |
commit | 56e9c0a6eb4918ae010aa4689e4481ab67986a0c (patch) | |
tree | ae92769a6f62c01be0e5d0d73a5aa6ddd81dde76 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
parent | 6c00055a819ce8a6e2c3af2f65d4ea1a8559c491 (diff) | |
parent | 9aab3e3ee6f256a1eaabc275e0748132966f963d (diff) | |
download | talos-op-linux-56e9c0a6eb4918ae010aa4689e4481ab67986a0c.tar.gz talos-op-linux-56e9c0a6eb4918ae010aa4689e4481ab67986a0c.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index c19db438306c..cdfb343c7ec6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -412,7 +412,6 @@ struct iwl_ht_info { /* self configuration data */ u8 is_ht; u8 supported_chan_width; - u16 tx_mimo_ps_mode; u8 is_green_field; u8 sgf; /* HT_SHORT_GI_* short guard interval */ u8 max_amsdu_size; |