From 58669ce1157534d97a3ce59775eb8da138636494 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 25 May 2015 02:12:19 +0000 Subject: [PATCH] Re-enable renamed config symbols [armel/kirkwood] Enable DEBUG_MVEBU_UART0_ALTERNATE, replacing DEBUG_MVEBU_UART_ALTERNATE [s390x] Explicitly enable SCHED_TOPOLOGY, replacing SCHED_BOOK svn path=/dists/sid/linux/; revision=22699 --- debian/changelog | 2 ++ debian/config/armel/config.kirkwood | 2 +- debian/config/kernelarch-s390/config | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8193b7cc1..1cefdcb54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -152,6 +152,8 @@ linux (4.0.4-1) UNRELEASED; urgency=medium * [armhf] USB: musb: Fix order of conditions for assigning end point operations (regression in 3.19) * [armel/{kirkwood,orion5x}] Disable PM again to reduce kernel image size + * [armel/kirkwood] Enable DEBUG_MVEBU_UART0_ALTERNATE, replacing + DEBUG_MVEBU_UART_ALTERNATE [ Ian Campbell ] * [armhf+arm64] Enabled generic SYSCON regmap reset driver diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index ee7deda4e..2eedff001 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -23,7 +23,7 @@ CONFIG_FPE_NWFPE=y ## file: arch/arm/Kconfig.debug ## ## choice: Kernel low-level debugging port -CONFIG_DEBUG_MVEBU_UART_ALTERNATE=y +CONFIG_DEBUG_MVEBU_UART0_ALTERNATE=y ## end choice ## diff --git a/debian/config/kernelarch-s390/config b/debian/config/kernelarch-s390/config index 4c6ef3b60..b2672d144 100644 --- a/debian/config/kernelarch-s390/config +++ b/debian/config/kernelarch-s390/config @@ -5,7 +5,7 @@ CONFIG_COMPAT=y CONFIG_SMP=y CONFIG_NR_CPUS=32 CONFIG_HOTPLUG_CPU=y -CONFIG_SCHED_BOOK=y +CONFIG_SCHED_TOPOLOGY=y CONFIG_MATHEMU=y CONFIG_PACK_STACK=y # CONFIG_CHECK_STACK is not set