diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-12-02 15:46:37 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-02 15:46:37 -0500 |
commit | 09f921f83faa49cdea25abfb98c439c01526b89d (patch) | |
tree | 1e8ee5c8f14e0e57965eca81bc6725288fd3597b /drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | |
parent | 4cebb34caa5122216a1e2451eae9e0fc47ec2589 (diff) | |
parent | d89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_eeprom.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h index 57f64dbbcd8..9c1463307f0 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | |||
@@ -270,17 +270,12 @@ struct cal_tgt_pow_ht { | |||
270 | u8 tPow2x[14]; | 270 | u8 tPow2x[14]; |
271 | } __packed; | 271 | } __packed; |
272 | 272 | ||
273 | struct cal_ctl_edge_pwr { | ||
274 | u8 tPower:6, | ||
275 | flag:2; | ||
276 | } __packed; | ||
277 | |||
278 | struct cal_ctl_data_2g { | 273 | struct cal_ctl_data_2g { |
279 | struct cal_ctl_edge_pwr ctlEdges[AR9300_NUM_BAND_EDGES_2G]; | 274 | u8 ctlEdges[AR9300_NUM_BAND_EDGES_2G]; |
280 | } __packed; | 275 | } __packed; |
281 | 276 | ||
282 | struct cal_ctl_data_5g { | 277 | struct cal_ctl_data_5g { |
283 | struct cal_ctl_edge_pwr ctlEdges[AR9300_NUM_BAND_EDGES_5G]; | 278 | u8 ctlEdges[AR9300_NUM_BAND_EDGES_5G]; |
284 | } __packed; | 279 | } __packed; |
285 | 280 | ||
286 | struct ar9300_BaseExtension_1 { | 281 | struct ar9300_BaseExtension_1 { |