diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /drivers/net/wireless/rt2x00/rt2x00.h | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index c21af38cc5af..6b2b92bfbc6b 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
| @@ -212,8 +212,9 @@ struct channel_info { | |||
| 212 | unsigned int flags; | 212 | unsigned int flags; |
| 213 | #define GEOGRAPHY_ALLOWED 0x00000001 | 213 | #define GEOGRAPHY_ALLOWED 0x00000001 |
| 214 | 214 | ||
| 215 | short tx_power1; | 215 | short max_power; |
| 216 | short tx_power2; | 216 | short default_power1; |
| 217 | short default_power2; | ||
| 217 | }; | 218 | }; |
| 218 | 219 | ||
| 219 | /* | 220 | /* |