diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-05 17:09:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-05 17:09:28 -0400 |
| commit | 90864fbc7639d7a2300c67a18c9fb9fbcf7d51d2 (patch) | |
| tree | 6951c8d0e529dbfc7c4cec75d4cec63350e39b7c /drivers/net/wireless/rtlwifi/regd.h | |
| parent | 228e548e602061b08ee8e8966f567c12aa079682 (diff) | |
| parent | a70171dce9cd44cb06c7d299eba9fa87a8933045 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rtlwifi/regd.h')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/regd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/regd.h b/drivers/net/wireless/rtlwifi/regd.h index 4cdbc4ae76d4..d23118938fac 100644 --- a/drivers/net/wireless/rtlwifi/regd.h +++ b/drivers/net/wireless/rtlwifi/regd.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | struct country_code_to_enum_rd { | 33 | struct country_code_to_enum_rd { |
| 34 | u16 countrycode; | 34 | u16 countrycode; |
| 35 | const char *isoName; | 35 | const char *iso_name; |
| 36 | }; | 36 | }; |
| 37 | 37 | ||
| 38 | enum country_code_type_t { | 38 | enum country_code_type_t { |