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/platform_data/mmc-esdhc-imx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/include/linux/platform_data/mmc-esdhc-imx.h') diff --git a/kernel/include/linux/platform_data/mmc-esdhc-imx.h b/kernel/include/linux/platform_data/mmc-esdhc-imx.h index 75f70f6ac..95ccab3f4 100644 --- a/kernel/include/linux/platform_data/mmc-esdhc-imx.h +++ b/kernel/include/linux/platform_data/mmc-esdhc-imx.h @@ -43,8 +43,8 @@ struct esdhc_platform_data { enum wp_types wp_type; enum cd_types cd_type; int max_bus_width; - unsigned int f_max; bool support_vsel; unsigned int delay_line; + unsigned int tuning_step; /* The delay cell steps in tuning procedure */ }; #endif /* __ASM_ARCH_IMX_ESDHC_H */ -- cgit 1.2.3-korg