diff options
| author | Joerg Albert <jal2@gmx.de> | 2009-09-05 16:07:43 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-09-08 22:31:09 +0200 |
| commit | 7f42c37aa676825fea329a7bec2fefe51033b3e9 (patch) | |
| tree | 39acddd569d9488325efb9b73452ce75b8d42552 | |
| parent | ssb: Fail ssb modinit, if attach of the buses failed. (diff) | |
| download | linux-7f42c37aa676825fea329a7bec2fefe51033b3e9.tar.xz linux-7f42c37aa676825fea329a7bec2fefe51033b3e9.zip | |
ath,ar9170: move CTL_ defines into regd.h
The ar9170 driver needs the defines for conformance test limit groups
and cannot include regd_common.h
Signed-off-by: Joerg Albert <jal2@gmx.de>
Acked-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/regd.h | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/regd_common.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h index 4d3c53674e5a..c1dd857697a7 100644 --- a/drivers/net/wireless/ath/regd.h +++ b/drivers/net/wireless/ath/regd.h @@ -22,6 +22,12 @@ #include "ath.h" +enum ctl_group { + CTL_FCC = 0x10, + CTL_MKK = 0x40, + CTL_ETSI = 0x30, +}; + #define NO_CTL 0xff #define SD_NO_CTL 0xE0 #define NO_CTL 0xff diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h index ad6d938d3cf6..9847af72208c 100644 --- a/drivers/net/wireless/ath/regd_common.h +++ b/drivers/net/wireless/ath/regd_common.h @@ -154,12 +154,6 @@ enum EnumRd { DEBUG_REG_DMN = 0x01ff, }; -enum ctl_group { - CTL_FCC = 0x10, - CTL_MKK = 0x40, - CTL_ETSI = 0x30, -}; - /* Regpair to CTL band mapping */ static struct reg_dmn_pair_mapping regDomainPairs[] = { /* regpair, 5 GHz CTL, 2 GHz CTL */ |