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/include/uapi/mtd/mtd-user.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'kernel/include/uapi/mtd') diff --git a/kernel/include/uapi/mtd/mtd-user.h b/kernel/include/uapi/mtd/mtd-user.h index 83327c808..e71d5558c 100644 --- a/kernel/include/uapi/mtd/mtd-user.h +++ b/kernel/include/uapi/mtd/mtd-user.h @@ -20,8 +20,6 @@ #ifndef __MTD_USER_H__ #define __MTD_USER_H__ -#include - /* This file is blessed for inclusion by userspace */ #include -- cgit 1.2.3-korg