diff options
| author | Ben Hutchings <benh@debian.org> | 2015-05-25 02:12:19 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2015-05-25 02:12:19 +0000 |
| commit | 58669ce1157534d97a3ce59775eb8da138636494 (patch) | |
| tree | 06b9c442a2cb19e7c497540be9b3d0382debb38c | |
| parent | dd786ed5590a55e5a6df4c1f9ddb05ffbf2c6acd (diff) | |
| download | kernel_replicant_linux-58669ce1157534d97a3ce59775eb8da138636494.tar.gz kernel_replicant_linux-58669ce1157534d97a3ce59775eb8da138636494.tar.bz2 kernel_replicant_linux-58669ce1157534d97a3ce59775eb8da138636494.zip | |
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
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/config/armel/config.kirkwood | 2 | ||||
| -rw-r--r-- | debian/config/kernelarch-s390/config | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 8193b7cc1fa3..1cefdcb5479e 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 ee7deda4ecdb..2eedff001e91 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 4c6ef3b608fd..b2672d14401d 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 |