diff options
| author | John W. Linville | 2012-11-21 20:38:49 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-11-21 20:38:49 +0100 |
| commit | 1e60896fe07307baa5f3ca1a220dfa9792657352 (patch) | |
| tree | b68ba91a72b1b421d37914e4201fc672f12d86ae /drivers/net/wireless/iwlwifi/dvm/main.c | |
| parent | brcmsmac: Remove stray argument from debug macro (diff) | |
| parent | iwlwifi: remove effectless assignment (diff) | |
| download | kernel-qcow2-linux-1e60896fe07307baa5f3ca1a220dfa9792657352.tar.gz kernel-qcow2-linux-1e60896fe07307baa5f3ca1a220dfa9792657352.tar.xz kernel-qcow2-linux-1e60896fe07307baa5f3ca1a220dfa9792657352.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/main.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c index 37bb4575ad8d..e3a07c916812 100644 --- a/drivers/net/wireless/iwlwifi/dvm/main.c +++ b/drivers/net/wireless/iwlwifi/dvm/main.c @@ -1191,8 +1191,6 @@ static void iwl_option_config(struct iwl_priv *priv) static int iwl_eeprom_init_hw_params(struct iwl_priv *priv) { - priv->eeprom_data->sku = priv->eeprom_data->sku; - if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE && !priv->cfg->ht_params) { IWL_ERR(priv, "Invalid 11n configuration\n"); |