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/arch/arm/mach-s3c24xx/s3c244x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/arch/arm/mach-s3c24xx/s3c244x.c') diff --git a/kernel/arch/arm/mach-s3c24xx/s3c244x.c b/kernel/arch/arm/mach-s3c24xx/s3c244x.c index b14119585..31fd27326 100644 --- a/kernel/arch/arm/mach-s3c24xx/s3c244x.c +++ b/kernel/arch/arm/mach-s3c24xx/s3c244x.c @@ -41,9 +41,9 @@ #include #include #include -#include #include "common.h" +#include "nand-core.h" #include "regs-dsc.h" static struct map_desc s3c244x_iodesc[] __initdata = { -- cgit 1.2.3-korg