Author: waldi Date: Mon Sep 3 21:06:59 2007 New Revision: 9443 Log: debian/config/s390: Reorder config.
Modified: dists/trunk/linux-2.6/debian/config/s390/config dists/trunk/linux-2.6/debian/config/s390/config.s390 dists/trunk/linux-2.6/debian/config/s390/config.s390-tape dists/trunk/linux-2.6/debian/config/s390/config.s390x Modified: dists/trunk/linux-2.6/debian/config/s390/config ============================================================================== --- dists/trunk/linux-2.6/debian/config/s390/config (original) +++ dists/trunk/linux-2.6/debian/config/s390/config Mon Sep 3 21:06:59 2007 @@ -1,42 +1,62 @@ -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_ARCH_S390=y -CONFIG_LOCK_KERNEL=y -# CONFIG_IKCONFIG is not set -CONFIG_STOP_MACHINE=y +# +# Processor type and features +# CONFIG_SMP=y CONFIG_NR_CPUS=32 CONFIG_HOTPLUG_CPU=y -# CONFIG_PACK_STACK is not set +CONFIG_MATHEMU=y +CONFIG_COMPAT=y +CONFIG_S390_SWITCH_AMODE=y +CONFIG_S390_EXEC_PROTECT=y + +# +# Code generation options +# +CONFIG_PACK_STACK=y +# CONFIG_SMALL_STACK is not set # CONFIG_CHECK_STACK is not set # CONFIG_WARN_STACK is not set + +# +# I/O subsystem configuration +# CONFIG_MACHCHK_WARNING=y CONFIG_QDIO=y # CONFIG_QDIO_DEBUG is not set + +# +# Misc +# CONFIG_IPL=y + # CONFIG_PROCESS_DEBUG is not set CONFIG_PFAULT=y # CONFIG_SHARED_KERNEL is not set CONFIG_CMM=y CONFIG_CMM_PROC=y +CONFIG_CMM_IUCV=y CONFIG_VIRT_TIMER=y CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_APPLDATA_BASE=y CONFIG_APPLDATA_MEM=m CONFIG_APPLDATA_OS=m CONFIG_APPLDATA_NET_SUM=m + CONFIG_NO_IDLE_HZ=y CONFIG_NO_IDLE_HZ_INIT=y -# CONFIG_PCMCIA is not set -CONFIG_STANDALONE=y -# CONFIG_SCSI_DEBUG is not set -CONFIG_ZFCP=m -CONFIG_CCW=y -CONFIG_BLK_DEV_LOOP=m -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set -CONFIG_BLK_DEV_RAM_SIZE=24576 -CONFIG_BLK_DEV_INITRD=y -# CONFIG_CDROM_PKTCDVD is not set +CONFIG_S390_HYPFS_FS=y +CONFIG_KEXEC=y +# CONFIG_ZFCPDUMP is not set + +# +# Networking options +# +CONFIG_IUCV=m +CONFIG_AFIUCV=m + +# +# S/390 block device drivers +# CONFIG_BLK_DEV_XPRAM=m CONFIG_DCSSBLK=m CONFIG_DASD=m @@ -45,21 +65,38 @@ CONFIG_DASD_FBA=m CONFIG_DASD_DIAG=m # CONFIG_DASD_EER is not set -# CONFIG_ATA_OVER_ETH is not set -# CONFIG_DM_MULTIPATH_EMC is not set -# CONFIG_WATCHDOG is not set + +# +# SCSI Transports +# +CONFIG_ZFCP=m + +# +# S/390 network device drivers +# +CONFIG_LCS=m +CONFIG_CTC=m +CONFIG_NETIUCV=m +CONFIG_SMSGIUCV=m +CONFIG_CLAW=m +CONFIG_QETH=m +CONFIG_QETH_IPV6=y +CONFIG_QETH_VLAN=y + +# +# S/390 character device drivers +# CONFIG_TN3270=y -# CONFIG_TN3270_TTY is not set -# CONFIG_TN3270_FS is not set +CONFIG_TN3270_TTY=y +CONFIG_TN3270_FS=m +CONFIG_TN3270_CONSOLE=y CONFIG_TN3215=y CONFIG_TN3215_CONSOLE=y -CONFIG_CCW_CONSOLE=y -CONFIG_SCLP=y CONFIG_SCLP_TTY=y CONFIG_SCLP_CONSOLE=y CONFIG_SCLP_VT220_TTY=y CONFIG_SCLP_VT220_CONSOLE=y -# CONFIG_SCLP_CPI is not set +CONFIG_SCLP_CPI=m CONFIG_S390_TAPE=m CONFIG_S390_TAPE_BLOCK=y CONFIG_S390_TAPE_34XX=m @@ -67,6 +104,26 @@ CONFIG_VMLOGRDR=m CONFIG_VMCP=m CONFIG_MONREADER=m +CONFIG_MONWRITER=m +CONFIG_S390_VMUR=m + +# +# Instrumentation Support +# +# CONFIG_PROFILING is not set +# CONFIG_KPROBES is not set + +CONFIG_STANDALONE=y +# CONFIG_SCSI_DEBUG is not set +CONFIG_BLK_DEV_LOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_RAM_SIZE=24576 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_DM_MULTIPATH_EMC is not set +# CONFIG_WATCHDOG is not set CONFIG_Z90CRYPT=m CONFIG_IPV6=y # CONFIG_ATM is not set @@ -89,16 +146,6 @@ # CONFIG_DUMMY is not set # CONFIG_NET_RADIO is not set # CONFIG_WAN is not set -CONFIG_LCS=m -CONFIG_CTC=m -CONFIG_IUCV=m -CONFIG_NETIUCV=m -CONFIG_SMSGIUCV=m -CONFIG_CLAW=m -CONFIG_QETH=m -CONFIG_QETH_IPV6=y -CONFIG_QETH_VLAN=y -CONFIG_CCWGROUP=m # CONFIG_PPP is not set # CONFIG_SLIP is not set # CONFIG_SHAPER is not set @@ -142,16 +189,9 @@ # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set # CONFIG_EFI_PARTITION is not set -# CONFIG_PROFILING is not set CONFIG_CRYPTO_SHA1_S390=m CONFIG_CRYPTO_SHA256_S390=m CONFIG_CRYPTO_DES_S390=m CONFIG_CRYPTO_AES_S390=m # CONFIG_CRC_CCITT is not set CONFIG_CRC32=m -CONFIG_KEXEC=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_HANGCHECK_TIMER is not set -CONFIG_FLATMEM_MANUAL=y -CONFIG_S390_HYPFS_FS=y -CONFIG_RESOURCES_64BIT=y Modified: dists/trunk/linux-2.6/debian/config/s390/config.s390 ============================================================================== --- dists/trunk/linux-2.6/debian/config/s390/config.s390 (original) +++ dists/trunk/linux-2.6/debian/config/s390/config.s390 Mon Sep 3 21:06:59 2007 @@ -1,11 +1,6 @@ -CONFIG_UID16=y -# CONFIG_ARCH_S390X is not set # CONFIG_64BIT is not set -CONFIG_ARCH_S390_31=y -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/config/s390/config.s390-tape ============================================================================== --- dists/trunk/linux-2.6/debian/config/s390/config.s390-tape (original) +++ dists/trunk/linux-2.6/debian/config/s390/config.s390-tape Mon Sep 3 21:06:59 2007 @@ -1,11 +1,6 @@ -CONFIG_UID16=y -# CONFIG_ARCH_S390X is not set # CONFIG_64BIT is not set -CONFIG_ARCH_S390_31=y -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/config/s390/config.s390x ============================================================================== --- dists/trunk/linux-2.6/debian/config/s390/config.s390x (original) +++ dists/trunk/linux-2.6/debian/config/s390/config.s390x Mon Sep 3 21:06:59 2007 @@ -1,9 +1,4 @@ -CONFIG_ARCH_S390X=y CONFIG_64BIT=y -CONFIG_S390_SUPPORT=y -CONFIG_COMPAT=y -CONFIG_SYSVIPC_COMPAT=y -CONFIG_BINFMT_ELF32=y # CONFIG_MARCH_G5 is not set CONFIG_MARCH_Z900=y # CONFIG_MARCH_Z990 is not set _______________________________________________ Kernel-svn-changes mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
