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/linux/amba/bus.h | 2 -- kernel/include/linux/amba/sp810.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'kernel/include/linux/amba') diff --git a/kernel/include/linux/amba/bus.h b/kernel/include/linux/amba/bus.h index 50fc66868..9006c4e75 100644 --- a/kernel/include/linux/amba/bus.h +++ b/kernel/include/linux/amba/bus.h @@ -41,8 +41,6 @@ struct amba_driver { int (*probe)(struct amba_device *, const struct amba_id *); int (*remove)(struct amba_device *); void (*shutdown)(struct amba_device *); - int (*suspend)(struct amba_device *, pm_message_t); - int (*resume)(struct amba_device *); const struct amba_id *id_table; }; diff --git a/kernel/include/linux/amba/sp810.h b/kernel/include/linux/amba/sp810.h index c7df89f99..58fe9e8b6 100644 --- a/kernel/include/linux/amba/sp810.h +++ b/kernel/include/linux/amba/sp810.h @@ -2,7 +2,7 @@ * ARM PrimeXsys System Controller SP810 header file * * Copyright (C) 2009 ST Microelectronics - * Viresh Kumar + * Viresh Kumar * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any -- cgit 1.2.3-korg