diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-08 03:14:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-08 03:15:00 -0400 |
| commit | 153db80f8cf74e8700cac96305b6c0b92918f17c (patch) | |
| tree | c2afb28e7b3f4fbf0aacd9edd39d7f895321ca0c /drivers/net/wireless/ath/regd.h | |
| parent | 5fd03ddab7fdbc44bfb2d183a4531c26a8dbca5a (diff) | |
| parent | cb655d0f3d57c23db51b981648e452988c0223f9 (diff) | |
Merge commit 'v2.6.36-rc7' into core/memblock
Merge reason: Update from -rc3 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/wireless/ath/regd.h')
| -rw-r--r-- | drivers/net/wireless/ath/regd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h index a1c39526161a..345dd9721b41 100644 --- a/drivers/net/wireless/ath/regd.h +++ b/drivers/net/wireless/ath/regd.h | |||
| @@ -31,7 +31,6 @@ enum ctl_group { | |||
| 31 | #define NO_CTL 0xff | 31 | #define NO_CTL 0xff |
| 32 | #define SD_NO_CTL 0xE0 | 32 | #define SD_NO_CTL 0xE0 |
| 33 | #define NO_CTL 0xff | 33 | #define NO_CTL 0xff |
| 34 | #define CTL_MODE_M 7 | ||
| 35 | #define CTL_11A 0 | 34 | #define CTL_11A 0 |
| 36 | #define CTL_11B 1 | 35 | #define CTL_11B 1 |
| 37 | #define CTL_11G 2 | 36 | #define CTL_11G 2 |