diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-02-08 13:16:17 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-02-08 13:16:17 -0500 |
commit | f5237f278f30a92401539a54f87ee0c717b6f818 (patch) | |
tree | 209d4fd6fb00e660c76ca8ac5d4caed59dbb9957 /drivers/net/wireless/rtlwifi/wifi.h | |
parent | b285109dde7b873b5dc671ef1b3ae3090f4bc72f (diff) | |
parent | b26f5f09ebdeb85ab152344cc1d6d484a3ce967d (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/rtlwifi/wifi.h')
-rw-r--r-- | drivers/net/wireless/rtlwifi/wifi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index 21a5f4f4a135..f13258a8d995 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h | |||
@@ -1702,7 +1702,7 @@ struct rtl_works { | |||
1702 | 1702 | ||
1703 | struct rtl_debug { | 1703 | struct rtl_debug { |
1704 | u32 dbgp_type[DBGP_TYPE_MAX]; | 1704 | u32 dbgp_type[DBGP_TYPE_MAX]; |
1705 | u32 global_debuglevel; | 1705 | int global_debuglevel; |
1706 | u64 global_debugcomponents; | 1706 | u64 global_debugcomponents; |
1707 | 1707 | ||
1708 | /* add for proc debug */ | 1708 | /* add for proc debug */ |