diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
| commit | befddb21c845f8fb49e637997891ef97c6a869dc (patch) | |
| tree | 0e7629123184f2dd50291ad6d477b894175f0f26 /drivers/net/wireless/rtlwifi/debug.h | |
| parent | e716efde75267eab919cdb2bef5b2cb77f305326 (diff) | |
| parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) | |
Merge tag 'v3.8-rc4' into irq/core
Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/debug.h')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/debug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtlwifi/debug.h b/drivers/net/wireless/rtlwifi/debug.h index 07493d2957f2..fd3269f47685 100644 --- a/drivers/net/wireless/rtlwifi/debug.h +++ b/drivers/net/wireless/rtlwifi/debug.h | |||
| @@ -106,6 +106,8 @@ | |||
| 106 | #define COMP_REGD BIT(27) | 106 | #define COMP_REGD BIT(27) |
| 107 | #define COMP_CHAN BIT(28) | 107 | #define COMP_CHAN BIT(28) |
| 108 | #define COMP_USB BIT(29) | 108 | #define COMP_USB BIT(29) |
| 109 | #define COMP_EASY_CONCURRENT COMP_USB /* reuse of this bit is OK */ | ||
| 110 | #define COMP_BT_COEXIST BIT(30) | ||
| 109 | 111 | ||
| 110 | /*-------------------------------------------------------------- | 112 | /*-------------------------------------------------------------- |
| 111 | Define the rt_print components | 113 | Define the rt_print components |