Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2 files changed, 4 insertions, 2 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 163a8a06b22d..43307bd42a69 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -42,7 +42,8 @@ static struct zd_reg_alpha2_map reg_alpha2_map[] = {
         { ZD_REGDOMAIN_IC, "CA" },
         { ZD_REGDOMAIN_ETSI, "DE" }, /* Generic ETSI, use most restrictive */
         { ZD_REGDOMAIN_JAPAN, "JP" },
-        { ZD_REGDOMAIN_JAPAN_ADD, "JP" },
+        { ZD_REGDOMAIN_JAPAN_2, "JP" },
+        { ZD_REGDOMAIN_JAPAN_3, "JP" },
         { ZD_REGDOMAIN_SPAIN, "ES" },
         { ZD_REGDOMAIN_FRANCE, "FR" },
 };
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h
index e4c70e359ced..a6d86b996c79 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@ -212,8 +212,9 @@ struct zd_mac {
 #define ZD_REGDOMAIN_ETSI       0x30
 #define ZD_REGDOMAIN_SPAIN      0x31
 #define ZD_REGDOMAIN_FRANCE     0x32
-#define ZD_REGDOMAIN_JAPAN_ADD  0x40
+#define ZD_REGDOMAIN_JAPAN_2    0x40
 #define ZD_REGDOMAIN_JAPAN      0x41
+#define ZD_REGDOMAIN_JAPAN_3    0x49
 
 enum {
         MIN_CHANNEL24 = 1,