[kernel] r5173 - dists/trunk/linux-2.6/debian/arch/s390

[Bastian Blank]

Author: waldi
Date: Mon Jan  2 11:06:05 2006
New Revision: 5173

Modified:
   dists/trunk/linux-2.6/debian/arch/s390/config
   dists/trunk/linux-2.6/debian/arch/s390/config.s390
   dists/trunk/linux-2.6/debian/arch/s390/config.s390-tape
   dists/trunk/linux-2.6/debian/arch/s390/config.s390x
Log:
- Enable CPU hotplug.
- Move some options around.

* debian/arch/s390/config, debian/arch/s390/config.s390,
* debian/arch/s390/config.s390-tape, debian/arch/s390/config.s390x:
  Update.


Modified: dists/trunk/linux-2.6/debian/arch/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/s390/config	Mon Jan  2 11:06:05 2006
@@ -12,8 +12,7 @@
 CONFIG_STOP_MACHINE=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=32
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_MARCH_Z990 is not set
+CONFIG_HOTPLUG_CPU=y
 # CONFIG_PACK_STACK is not set
 # CONFIG_CHECK_STACK is not set
 # CONFIG_WARN_STACK is not set

Modified: dists/trunk/linux-2.6/debian/arch/s390/config.s390
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config.s390	(original)
+++ dists/trunk/linux-2.6/debian/arch/s390/config.s390	Mon Jan  2 11:06:05 2006
@@ -5,6 +5,7 @@
 CONFIG_MATHEMU=y
 CONFIG_MARCH_G5=y
 # CONFIG_MARCH_Z900 is not set
+# CONFIG_MARCH_Z990 is not set
 # CONFIG_IPL_TAPE is not set
 CONFIG_IPL_VM=y
 # CONFIG_LBD is not set

Modified: dists/trunk/linux-2.6/debian/arch/s390/config.s390-tape
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config.s390-tape	(original)
+++ dists/trunk/linux-2.6/debian/arch/s390/config.s390-tape	Mon Jan  2 11:06:05 2006
@@ -5,6 +5,7 @@
 CONFIG_MATHEMU=y
 CONFIG_MARCH_G5=y
 # CONFIG_MARCH_Z900 is not set
+# CONFIG_MARCH_Z990 is not set
 CONFIG_IPL_TAPE=y
 # CONFIG_IPL_VM is not set
 # CONFIG_LBD is not set

Modified: dists/trunk/linux-2.6/debian/arch/s390/config.s390x
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config.s390x	(original)
+++ dists/trunk/linux-2.6/debian/arch/s390/config.s390x	Mon Jan  2 11:06:05 2006
@@ -6,5 +6,6 @@
 CONFIG_BINFMT_ELF32=y
 # CONFIG_MARCH_G5 is not set
 CONFIG_MARCH_Z900=y
+# CONFIG_MARCH_Z990 is not set
 # CONFIG_IPL_TAPE is not set
 CONFIG_IPL_VM=y