[kernel] r22699 - in dists/sid/linux/debian: . config/armel config/kernelarch-s390

[Ben Hutchings]

Author: benh
Date: Mon May 25 02:12:19 2015
New Revision: 22699

Log:
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

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/armel/config.kirkwood
   dists/sid/linux/debian/config/kernelarch-s390/config

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Mon May 25 01:52:08 2015	(r22698)
+++ dists/sid/linux/debian/changelog	Mon May 25 02:12:19 2015	(r22699)
@@ -152,6 +152,8 @@
   * [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

Modified: dists/sid/linux/debian/config/armel/config.kirkwood
==============================================================================
--- dists/sid/linux/debian/config/armel/config.kirkwood	Mon May 25 01:52:08 2015	(r22698)
+++ dists/sid/linux/debian/config/armel/config.kirkwood	Mon May 25 02:12:19 2015	(r22699)
@@ -23,7 +23,7 @@
 ## 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
 
 ##

Modified: dists/sid/linux/debian/config/kernelarch-s390/config
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-s390/config	Mon May 25 01:52:08 2015	(r22698)
+++ dists/sid/linux/debian/config/kernelarch-s390/config	Mon May 25 02:12:19 2015	(r22699)
@@ -5,7 +5,7 @@
 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