diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-17 17:19:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-17 17:19:06 -0400 |
| commit | bb9c03d8a6893517737b16fdbeb54be3c73b3023 (patch) | |
| tree | 35fa0d1defaaf94641963a49126d7bb475ffa4c6 /drivers/net/wireless/zd1211rw/zd_mac.h | |
| parent | 4de57826810fd2cfeb2ab5c7d003ff9116b8f7ee (diff) | |
| parent | abf52f86aa0a49a7377350cafa8f218c4cd227e7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_mac.h')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h index e4c70e359ce..a6d86b996c7 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.h +++ b/drivers/net/wireless/zd1211rw/zd_mac.h | |||
| @@ -212,8 +212,9 @@ struct zd_mac { | |||
| 212 | #define ZD_REGDOMAIN_ETSI 0x30 | 212 | #define ZD_REGDOMAIN_ETSI 0x30 |
| 213 | #define ZD_REGDOMAIN_SPAIN 0x31 | 213 | #define ZD_REGDOMAIN_SPAIN 0x31 |
| 214 | #define ZD_REGDOMAIN_FRANCE 0x32 | 214 | #define ZD_REGDOMAIN_FRANCE 0x32 |
| 215 | #define ZD_REGDOMAIN_JAPAN_ADD 0x40 | 215 | #define ZD_REGDOMAIN_JAPAN_2 0x40 |
| 216 | #define ZD_REGDOMAIN_JAPAN 0x41 | 216 | #define ZD_REGDOMAIN_JAPAN 0x41 |
| 217 | #define ZD_REGDOMAIN_JAPAN_3 0x49 | ||
| 217 | 218 | ||
| 218 | enum { | 219 | enum { |
| 219 | MIN_CHANNEL24 = 1, | 220 | MIN_CHANNEL24 = 1, |