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/powerpc/configs/85xx/xes_mpc85xx_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/arch/powerpc/configs/85xx') diff --git a/kernel/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/kernel/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig index 34f3ea172..858b539d0 100644 --- a/kernel/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig +++ b/kernel/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig @@ -108,7 +108,7 @@ CONFIG_SENSORS_LM90=y CONFIG_WATCHDOG=y CONFIG_USB=y CONFIG_USB_MON=y -CONFIG_USB_ISP1760_HCD=y +CONFIG_USB_ISP1760=y CONFIG_USB_STORAGE=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y -- cgit 1.2.3-korg