diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/wireless/at76c50x-usb.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.h')
| -rw-r--r-- | drivers/net/wireless/at76c50x-usb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.h b/drivers/net/wireless/at76c50x-usb.h index 4a37447dfc01..f14a65473fe8 100644 --- a/drivers/net/wireless/at76c50x-usb.h +++ b/drivers/net/wireless/at76c50x-usb.h | |||
| @@ -290,7 +290,7 @@ struct mib_mac_mgmt { | |||
| 290 | u8 res; | 290 | u8 res; |
| 291 | u8 multi_domain_capability_implemented; | 291 | u8 multi_domain_capability_implemented; |
| 292 | u8 multi_domain_capability_enabled; | 292 | u8 multi_domain_capability_enabled; |
| 293 | u8 country_string[3]; | 293 | u8 country_string[IEEE80211_COUNTRY_STRING_LEN]; |
| 294 | u8 reserved[3]; | 294 | u8 reserved[3]; |
| 295 | } __packed; | 295 | } __packed; |
| 296 | 296 | ||