diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 12:56:40 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 12:56:55 -0500 |
| commit | 66b0835e2bb3d345f060a47bb8c8f883bd25ec2b (patch) | |
| tree | d1fc390dfa58f131df908267d87ef99d4522a596 /drivers/net/wireless/ath/ath9k/hw.h | |
| parent | 479b46b5599b1e610630d7332e168c1f9c4ee0b4 (diff) | |
| parent | 85e2efbb1db9a18d218006706d6e4fbeb0216213 (diff) | |
Merge 2.6.38-rc5 into usb-next
This is needed to resolve some merge conflicts that were found
in the USB host controller patches, and reported by Stephen Rothwell.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 5a3dfec45e96..ea9fde670646 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
| @@ -225,6 +225,7 @@ struct ath9k_ops_config { | |||
| 225 | u32 pcie_waen; | 225 | u32 pcie_waen; |
| 226 | u8 analog_shiftreg; | 226 | u8 analog_shiftreg; |
| 227 | u8 ht_enable; | 227 | u8 ht_enable; |
| 228 | u8 paprd_disable; | ||
| 228 | u32 ofdm_trig_low; | 229 | u32 ofdm_trig_low; |
| 229 | u32 ofdm_trig_high; | 230 | u32 ofdm_trig_high; |
| 230 | u32 cck_trig_high; | 231 | u32 cck_trig_high; |