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/plat-omap/dma.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'kernel/arch/arm/plat-omap') diff --git a/kernel/arch/arm/plat-omap/dma.c b/kernel/arch/arm/plat-omap/dma.c index 6416e03b4..1e460b4ee 100644 --- a/kernel/arch/arm/plat-omap/dma.c +++ b/kernel/arch/arm/plat-omap/dma.c @@ -38,6 +38,10 @@ #include +#ifdef CONFIG_ARCH_OMAP1 +#include +#endif + /* * MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA * channels that an instance of the SDMA IP block can support. Used -- cgit 1.2.3-korg