diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-07-08 15:03:36 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-08 15:03:36 (GMT) |
commit | 204d1641d200709c759d8c269458cbc7de378c40 (patch) | |
tree | ce88690b4422078883f1651537ccd1f5d8ed7258 /drivers/net/wireless/iwlwifi/iwl-1000.c | |
parent | 31817df025e24559a01d33ddd68bd11b21bf9d7b (diff) | |
parent | 5f0dd296a01c8173fcc05a8b262a1168ae90bc74 (diff) | |
download | linux-fsl-qoriq-204d1641d200709c759d8c269458cbc7de378c40.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-1000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index e57fad9..cf1449d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c @@ -138,7 +138,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) priv->hw_params.ht40_channel = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ); - priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR; priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant); if (priv->cfg->rx_with_siso_diversity) @@ -197,7 +196,6 @@ static struct iwl_lib_ops iwl1000_lib = { static const struct iwl_ops iwl1000_ops = { .lib = &iwl1000_lib, - .hcmd = &iwlagn_hcmd, .utils = &iwlagn_hcmd_utils, }; |