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/pxa2xx_ssp.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'kernel/include/linux/pxa2xx_ssp.h') diff --git a/kernel/include/linux/pxa2xx_ssp.h b/kernel/include/linux/pxa2xx_ssp.h index dab545bb6..c2f2574ff 100644 --- a/kernel/include/linux/pxa2xx_ssp.h +++ b/kernel/include/linux/pxa2xx_ssp.h @@ -194,8 +194,11 @@ enum pxa_ssp_type { PXA168_SSP, PXA910_SSP, CE4100_SSP, - LPSS_SSP, QUARK_X1000_SSP, + LPSS_LPT_SSP, /* Keep LPSS types sorted with lpss_platforms[] */ + LPSS_BYT_SSP, + LPSS_SPT_SSP, + LPSS_BXT_SSP, }; struct ssp_device { -- cgit 1.2.3-korg