diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 09:00:06 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 09:00:06 +0200 |
| commit | 4c8440666b995f20604852b35dcfdbcc1d5931f1 (patch) | |
| tree | b3b6cd65ee275ba1adf9d2c050063f30ebbadb91 /drivers/net/wireless/iwlegacy/iwl-eeprom.c | |
| parent | powerpc: Remove unused/obsolete CONFIG_XICS (diff) | |
| parent | powerpc/4xx: Fix regression in SMP on 476 (diff) | |
| download | linux-4c8440666b995f20604852b35dcfdbcc1d5931f1.tar.xz linux-4c8440666b995f20604852b35dcfdbcc1d5931f1.zip | |
Merge branch 'merge' into next
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-eeprom.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-eeprom.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-eeprom.c b/drivers/net/wireless/iwlegacy/iwl-eeprom.c index 04c5648027df..cb346d1a9ffa 100644 --- a/drivers/net/wireless/iwlegacy/iwl-eeprom.c +++ b/drivers/net/wireless/iwlegacy/iwl-eeprom.c @@ -471,13 +471,6 @@ int iwl_legacy_init_channel_map(struct iwl_priv *priv) flags & EEPROM_CHANNEL_RADAR)) ? "" : "not "); - /* Set the tx_power_user_lmt to the highest power - * supported by any channel */ - if (eeprom_ch_info[ch].max_power_avg > - priv->tx_power_user_lmt) - priv->tx_power_user_lmt = - eeprom_ch_info[ch].max_power_avg; - ch_info++; } } |