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) | |
| download | kernel_samsung_smdk4412-09f921f83faa49cdea25abfb98c439c01526b89d.zip kernel_samsung_smdk4412-09f921f83faa49cdea25abfb98c439c01526b89d.tar.gz kernel_samsung_smdk4412-09f921f83faa49cdea25abfb98c439c01526b89d.tar.bz2 | |
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 57f64db..9c14633 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 { u8 tPow2x[14]; } __packed; -struct cal_ctl_edge_pwr { - u8 tPower:6, - flag:2; -} __packed; - struct cal_ctl_data_2g { - struct cal_ctl_edge_pwr ctlEdges[AR9300_NUM_BAND_EDGES_2G]; + u8 ctlEdges[AR9300_NUM_BAND_EDGES_2G]; } __packed; struct cal_ctl_data_5g { - struct cal_ctl_edge_pwr ctlEdges[AR9300_NUM_BAND_EDGES_5G]; + u8 ctlEdges[AR9300_NUM_BAND_EDGES_5G]; } __packed; struct ar9300_BaseExtension_1 { |