diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-20 14:40:26 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-20 14:40:26 -0400 |
| commit | 324640e3594e9d824e72e864001a83d003588363 (patch) | |
| tree | c061f6d49f1dafcd7083482c581f831140087bc1 /drivers/net/wireless/iwlwifi/dvm/dev.h | |
| parent | ce77903c915ba05668ecffabd0e20bc2a61c2b3a (diff) | |
| parent | 8d40f4eebf43bd73aa7c6e06665fd7a26012f9c9 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/dev.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h index 4620b657948a..54cf085ddc89 100644 --- a/drivers/net/wireless/iwlwifi/dvm/dev.h +++ b/drivers/net/wireless/iwlwifi/dvm/dev.h @@ -568,7 +568,6 @@ enum iwl_scan_type { * * @tx_chains_num: Number of TX chains * @rx_chains_num: Number of RX chains - * @sku: sku read from EEPROM * @ct_kill_threshold: temperature threshold - in hw dependent unit * @ct_kill_exit_threshold: when to reeable the device - in hw dependent unit * relevant for 1000, 6000 and up @@ -579,7 +578,6 @@ struct iwl_hw_params { u8 tx_chains_num; u8 rx_chains_num; bool use_rts_for_aggregation; - u16 sku; u32 ct_kill_threshold; u32 ct_kill_exit_threshold; |