aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2006-10-18 12:30:59 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2006-10-18 12:30:59 -0400
commitce9b18f5cdd628196ca13bb783e8dcd5ad29ceaa (patch)
tree8e403341a484a7b1f65982196a7a01d74bac82e8 /arch/s390
parent9b10fe5b70878fb4b7e3e1b300f1bff0c73d4e2e (diff)
[S390] update default configuration
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/defconfig12
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index a3257398ea8d..c313e9a9304f 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18 3# Linux kernel version: 2.6.19-rc2
4# Wed Oct 4 19:45:46 2006 4# Wed Oct 18 17:11:10 2006
5# 5#
6CONFIG_MMU=y 6CONFIG_MMU=y
7CONFIG_LOCKDEP_SUPPORT=y 7CONFIG_LOCKDEP_SUPPORT=y
@@ -211,6 +211,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y
211CONFIG_INET6_XFRM_MODE_TUNNEL=y 211CONFIG_INET6_XFRM_MODE_TUNNEL=y
212CONFIG_INET6_XFRM_MODE_BEET=y 212CONFIG_INET6_XFRM_MODE_BEET=y
213# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 213# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
214CONFIG_IPV6_SIT=y
214# CONFIG_IPV6_TUNNEL is not set 215# CONFIG_IPV6_TUNNEL is not set
215# CONFIG_IPV6_SUBTREES is not set 216# CONFIG_IPV6_SUBTREES is not set
216# CONFIG_IPV6_MULTIPLE_TABLES is not set 217# CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -528,6 +529,7 @@ CONFIG_EXT3_FS=y
528CONFIG_EXT3_FS_XATTR=y 529CONFIG_EXT3_FS_XATTR=y
529# CONFIG_EXT3_FS_POSIX_ACL is not set 530# CONFIG_EXT3_FS_POSIX_ACL is not set
530# CONFIG_EXT3_FS_SECURITY is not set 531# CONFIG_EXT3_FS_SECURITY is not set
532# CONFIG_EXT4DEV_FS is not set
531CONFIG_JBD=y 533CONFIG_JBD=y
532# CONFIG_JBD_DEBUG is not set 534# CONFIG_JBD_DEBUG is not set
533CONFIG_FS_MBCACHE=y 535CONFIG_FS_MBCACHE=y
@@ -646,10 +648,6 @@ CONFIG_MSDOS_PARTITION=y
646# CONFIG_NLS is not set 648# CONFIG_NLS is not set
647 649
648# 650#
649# Distributed Lock Manager
650#
651
652#
653# Instrumentation Support 651# Instrumentation Support
654# 652#
655 653
@@ -669,7 +667,6 @@ CONFIG_MAGIC_SYSRQ=y
669# CONFIG_UNUSED_SYMBOLS is not set 667# CONFIG_UNUSED_SYMBOLS is not set
670CONFIG_DEBUG_KERNEL=y 668CONFIG_DEBUG_KERNEL=y
671CONFIG_LOG_BUF_SHIFT=17 669CONFIG_LOG_BUF_SHIFT=17
672# CONFIG_DETECT_SOFTLOCKUP is not set
673# CONFIG_SCHEDSTATS is not set 670# CONFIG_SCHEDSTATS is not set
674# CONFIG_DEBUG_SLAB is not set 671# CONFIG_DEBUG_SLAB is not set
675CONFIG_DEBUG_PREEMPT=y 672CONFIG_DEBUG_PREEMPT=y
@@ -690,6 +687,7 @@ CONFIG_DEBUG_FS=y
690# CONFIG_FRAME_POINTER is not set 687# CONFIG_FRAME_POINTER is not set
691# CONFIG_UNWIND_INFO is not set 688# CONFIG_UNWIND_INFO is not set
692CONFIG_FORCED_INLINING=y 689CONFIG_FORCED_INLINING=y
690CONFIG_HEADERS_CHECK=y
693# CONFIG_RCU_TORTURE_TEST is not set 691# CONFIG_RCU_TORTURE_TEST is not set
694# CONFIG_LKDTM is not set 692# CONFIG_LKDTM is not set
695 693