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
This commit is contained in:
Ben Hutchings 2015-05-25 02:12:19 +00:00
parent dd786ed559
commit 58669ce115
3 changed files with 4 additions and 2 deletions

2
debian/changelog vendored
View File

@ -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

View File

@ -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
##

View File

@ -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