Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1306a2b2 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds
Browse files

[PATCH] s390: default configuration 



Update default configuration of s390.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 62052d42

arch/s390/defconfig

+25 −11
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.13-rc4

# Linux kernel version: 2.6.14-rc1

# Fri Jul 29 14:49:30 2005

# Wed Sep 14 16:46:19 2005

#

#

CONFIG_MMU=y

CONFIG_MMU=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -21,6 +21,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 
# General setup

# General setup

#

#

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_SWAP=y

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_POSIX_MQUEUE=y
@@ -33,6 +34,7 @@ CONFIG_KOBJECT_UEVENT=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKCONFIG_PROC=y

# CONFIG_CPUSETS is not set

# CONFIG_CPUSETS is not set

CONFIG_INITRAMFS_SOURCE=""

# CONFIG_EMBEDDED is not set

# CONFIG_EMBEDDED is not set

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_ALL is not set
@@ -94,6 +96,7 @@ CONFIG_FLATMEM_MANUAL=y 
# CONFIG_SPARSEMEM_MANUAL is not set

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_FLATMEM=y

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set





#

#

# I/O subsystem configuration

# I/O subsystem configuration
@@ -151,8 +154,8 @@ CONFIG_IP_FIB_HASH=y 
# CONFIG_INET_ESP is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_IP_TCPDIAG=y

CONFIG_INET_DIAG=y

CONFIG_IP_TCPDIAG_IPV6=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_BIC=y

CONFIG_IPV6=y

CONFIG_IPV6=y
@@ -164,6 +167,11 @@ CONFIG_IPV6=y 
# CONFIG_IPV6_TUNNEL is not set

# CONFIG_IPV6_TUNNEL is not set

# CONFIG_NETFILTER is not set

# CONFIG_NETFILTER is not set





#

# DCCP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_DCCP is not set



#

#

# SCTP Configuration (EXPERIMENTAL)

# SCTP Configuration (EXPERIMENTAL)

#

#
@@ -217,9 +225,11 @@ CONFIG_NET_CLS_POLICE=y 
# Network testing

# Network testing

#

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NET_PKTGEN is not set

# CONFIG_NETFILTER_NETLINK is not set

# CONFIG_HAMRADIO is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_BT is not set

# CONFIG_IEEE80211 is not set

# CONFIG_PCMCIA is not set

# CONFIG_PCMCIA is not set





#

#
@@ -233,6 +243,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
#

#

# SCSI device support

# SCSI device support

#

#

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

CONFIG_SCSI=y

CONFIG_SCSI_PROC_FS=y

CONFIG_SCSI_PROC_FS=y
@@ -260,6 +271,7 @@ CONFIG_SCSI_LOGGING=y 
# CONFIG_SCSI_SPI_ATTRS is not set

# CONFIG_SCSI_SPI_ATTRS is not set

CONFIG_SCSI_FC_ATTRS=y

CONFIG_SCSI_FC_ATTRS=y

# CONFIG_SCSI_ISCSI_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set

# CONFIG_SCSI_SAS_ATTRS is not set





#

#

# SCSI low-level drivers

# SCSI low-level drivers
@@ -280,7 +292,6 @@ CONFIG_BLK_DEV_RAM=y 
CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=4096

CONFIG_BLK_DEV_RAM_SIZE=4096

CONFIG_BLK_DEV_INITRD=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

# CONFIG_LBD is not set

# CONFIG_LBD is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_CDROM_PKTCDVD is not set
@@ -383,6 +394,10 @@ CONFIG_BONDING=m 
CONFIG_EQUALIZER=m

CONFIG_EQUALIZER=m

CONFIG_TUN=m

CONFIG_TUN=m





#

# PHY device support

#



#

#

# Ethernet (10 or 100Mbit)

# Ethernet (10 or 100Mbit)

#

#
@@ -453,10 +468,6 @@ CONFIG_FS_MBCACHE=y 
# CONFIG_REISERFS_FS is not set

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

# CONFIG_FS_POSIX_ACL is not set



#

# XFS support

#

# CONFIG_XFS_FS is not set

# CONFIG_XFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

# CONFIG_ROMFS_FS is not set
@@ -465,6 +476,7 @@ CONFIG_INOTIFY=y 
CONFIG_DNOTIFY=y

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS4_FS is not set

# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set





#

#

# CD-ROM/DVD Filesystems

# CD-ROM/DVD Filesystems
@@ -485,11 +497,10 @@ CONFIG_DNOTIFY=y 
CONFIG_PROC_FS=y

CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_KCORE=y

CONFIG_SYSFS=y

CONFIG_SYSFS=y

# CONFIG_DEVPTS_FS_XATTR is not set

CONFIG_TMPFS=y

CONFIG_TMPFS=y

# CONFIG_TMPFS_XATTR is not set

# CONFIG_HUGETLB_PAGE is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set





#

#

# Miscellaneous filesystems

# Miscellaneous filesystems
@@ -533,6 +544,7 @@ CONFIG_SUNRPC=y 
# CONFIG_NCP_FS is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set

# CONFIG_AFS_FS is not set

# CONFIG_9P_FS is not set





#

#

# Partition Types

# Partition Types
@@ -572,6 +584,7 @@ CONFIG_MSDOS_PARTITION=y 
CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_KERNEL=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_LOG_BUF_SHIFT=17

CONFIG_LOG_BUF_SHIFT=17

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_DEBUG_PREEMPT=y

CONFIG_DEBUG_PREEMPT=y
@@ -626,5 +639,6 @@ CONFIG_CRYPTO=y 
# Library routines

# Library routines

#

#

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

CONFIG_CRC32=m

CONFIG_CRC32=m

# CONFIG_LIBCRC32C is not set
 
# CONFIG_LIBCRC32C is not set