From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: 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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- kernel/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kernel/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h') 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)*/ /*--------------------------------------------------------------------------*/ -- cgit 1.2.3-korg