diff options
author | 2016-04-11 10:41:07 +0300 | |
---|---|---|
committer | 2016-04-13 08:17:18 +0300 | |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h')
-rw-r--r-- | kernel/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h b/kernel/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h index 8dffe101b..b7dda9030 100644 --- a/kernel/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h +++ b/kernel/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h @@ -21,7 +21,8 @@ #define __RTL8712_CMDCTRL_BITDEF_H__ /* - * 2. Command Control Registers (Offset: 0x0040 - 0x004F)*/ + * 2. Command Control Registers (Offset: 0x0040 - 0x004F) + */ /*--------------------------------------------------------------------------*/ /* 8192S (CMD) command register bits (Offset 0x40, 16 bits)*/ /*--------------------------------------------------------------------------*/ |