aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Albert <jal2@gmx.de>2009-09-05 16:07:43 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-09-08 16:31:09 -0400
commit7f42c37aa676825fea329a7bec2fefe51033b3e9 (patch)
tree39acddd569d9488325efb9b73452ce75b8d42552
parente6c463e3a3d067f5da2c79d5acdb2f626754cdb3 (diff)
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.h6
-rw-r--r--drivers/net/wireless/ath/regd_common.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h
index 4d3c53674e5..c1dd857697a 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 ad6d938d3cf..9847af72208 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 */