diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2014-09-22 18:39:26 +0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-09-27 01:22:28 +0400 |
commit | 21e4b0726dc671c423e2dc9a85364716219c4502 (patch) | |
tree | 7fda5f1253c52ca7c4821a862ad1ebec46eaeb32 /drivers/net/wireless/rtlwifi/debug.h | |
parent | c151aed6aa146e9587590051aba9da68b9370f9b (diff) | |
download | linux-21e4b0726dc671c423e2dc9a85364716219c4502.tar.xz |
rtlwifi: rtl8821ae: Move driver from staging to regular tree
This driver was entered into staging a few cycles ago because there was
not time to integrate the Realtek version into the support routines in
the kernel. Now that there is an effort to converg the code base from Linux
and the Realtek repo, it is time to move this driver. In addition, all the
updates included in the 06/28/2014 version of the Realtek drivers are
included here.
With this change, it will be necessary to delete the staging driver. That
will be handled in a separate patch. As it impacts the staging tree, such a
patch is sent to a different destination.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/debug.h')
-rw-r--r-- | drivers/net/wireless/rtlwifi/debug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtlwifi/debug.h b/drivers/net/wireless/rtlwifi/debug.h index 534c224440e1..fc794b3e9f4a 100644 --- a/drivers/net/wireless/rtlwifi/debug.h +++ b/drivers/net/wireless/rtlwifi/debug.h @@ -104,6 +104,7 @@ #define COMP_USB BIT(29) #define COMP_EASY_CONCURRENT COMP_USB /* reuse of this bit is OK */ #define COMP_BT_COEXIST BIT(30) +#define COMP_IQK BIT(31) /*-------------------------------------------------------------- Define the rt_print components |