[kernel] r21692 - dists/trunk/linux/debian/config/kernelarch-s390

[Bastian Blank]

Author: waldi
Date: Wed Aug  6 16:28:08 2014
New Revision: 21692

Log:
debian/config/kernelarch-s390/config: Add some default options

Modified:
   dists/trunk/linux/debian/config/kernelarch-s390/config

Modified: dists/trunk/linux/debian/config/kernelarch-s390/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-s390/config	Wed Aug  6 16:17:07 2014	(r21691)
+++ dists/trunk/linux/debian/config/kernelarch-s390/config	Wed Aug  6 16:28:08 2014	(r21692)
@@ -5,10 +5,16 @@
 CONFIG_SMP=y
 CONFIG_NR_CPUS=32
 CONFIG_HOTPLUG_CPU=y
+CONFIG_SCHED_BOOK=y
 CONFIG_MATHEMU=y
 CONFIG_PACK_STACK=y
 # CONFIG_CHECK_STACK is not set
 CONFIG_QDIO=y
+CONFIG_PCI_NR_FUNCTIONS=64
+CONFIG_PCI_NR_MSI=256
+CONFIG_CHSC_SCH=m
+CONFIG_SCM_BUS=y
+CONFIG_EADM_SCH=m
 CONFIG_SECCOMP=y
 CONFIG_PFAULT=y
 # CONFIG_SHARED_KERNEL is not set
@@ -22,10 +28,17 @@
 CONFIG_S390_GUEST=y
 
 ##
+## file: arch/s390/Kconfig.debug
+##
+CONFIG_STRICT_DEVMEM=y
+# CONFIG_S390_PTDUMP is not set
+
+##
 ## file: arch/s390/kvm/Kconfig
 ##
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
+# CONFIG_KVM_S390_UCONTROL is not set
 
 ##
 ## file: block/partitions/Kconfig
@@ -90,6 +103,8 @@
 CONFIG_DASD_FBA=m
 CONFIG_DASD_DIAG=m
 # CONFIG_DASD_EER is not set
+CONFIG_SCM_BLOCK=m
+CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 
 ##
 ## file: drivers/s390/char/Kconfig
@@ -105,6 +120,7 @@
 CONFIG_SCLP_VT220_TTY=y
 CONFIG_SCLP_VT220_CONSOLE=y
 CONFIG_SCLP_CPI=m
+CONFIG_SCLP_ASYNC=m
 CONFIG_S390_TAPE=m
 CONFIG_S390_TAPE_34XX=m
 CONFIG_S390_TAPE_3590=m