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/boot/dts/ste-href.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/arch/arm/boot/dts/ste-href.dtsi') diff --git a/kernel/arch/arm/boot/dts/ste-href.dtsi b/kernel/arch/arm/boot/dts/ste-href.dtsi index 744c1e3a7..6d8ce1543 100644 --- a/kernel/arch/arm/boot/dts/ste-href.dtsi +++ b/kernel/arch/arm/boot/dts/ste-href.dtsi @@ -32,11 +32,11 @@ status = "okay"; }; + /* This UART is unused and thus left disabled */ uart@80121000 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&uart1_default_mode>; pinctrl-1 = <&uart1_sleep_mode>; - status = "okay"; }; uart@80007000 { -- cgit 1.2.3-korg