diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2006-02-11 20:55:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-12 00:41:12 -0500 |
commit | e6f3601a7275216c48c2635f46b388d970901bb9 (patch) | |
tree | d342bf9306b9e8e242c15547fc688383242fdba5 /arch | |
parent | c48d865c50e8626372a52094385fb1f5a2d2a7fd (diff) |
[PATCH] s390: update default configuration
Switch on CONFIG_DEBUG_FS again.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/s390/defconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 3525c91204d4..f8d0cd540a06 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.16-rc1 | 3 | # Linux kernel version: 2.6.16-rc2 |
4 | # Thu Jan 19 10:58:53 2006 | 4 | # Wed Feb 8 10:44:39 2006 |
5 | # | 5 | # |
6 | CONFIG_MMU=y | 6 | CONFIG_MMU=y |
7 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 7 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
@@ -12,7 +12,6 @@ CONFIG_S390=y | |||
12 | # Code maturity level options | 12 | # Code maturity level options |
13 | # | 13 | # |
14 | CONFIG_EXPERIMENTAL=y | 14 | CONFIG_EXPERIMENTAL=y |
15 | CONFIG_CLEAN_COMPILE=y | ||
16 | CONFIG_LOCK_KERNEL=y | 15 | CONFIG_LOCK_KERNEL=y |
17 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 16 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
18 | 17 | ||
@@ -154,6 +153,7 @@ CONFIG_NET=y | |||
154 | # | 153 | # |
155 | # Networking options | 154 | # Networking options |
156 | # | 155 | # |
156 | # CONFIG_NETDEBUG is not set | ||
157 | CONFIG_PACKET=y | 157 | CONFIG_PACKET=y |
158 | # CONFIG_PACKET_MMAP is not set | 158 | # CONFIG_PACKET_MMAP is not set |
159 | CONFIG_UNIX=y | 159 | CONFIG_UNIX=y |
@@ -607,6 +607,7 @@ CONFIG_MSDOS_PARTITION=y | |||
607 | # Instrumentation Support | 607 | # Instrumentation Support |
608 | # | 608 | # |
609 | # CONFIG_PROFILING is not set | 609 | # CONFIG_PROFILING is not set |
610 | # CONFIG_STATISTICS is not set | ||
610 | 611 | ||
611 | # | 612 | # |
612 | # Kernel hacking | 613 | # Kernel hacking |
@@ -624,7 +625,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
624 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 625 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
625 | # CONFIG_DEBUG_KOBJECT is not set | 626 | # CONFIG_DEBUG_KOBJECT is not set |
626 | # CONFIG_DEBUG_INFO is not set | 627 | # CONFIG_DEBUG_INFO is not set |
627 | # CONFIG_DEBUG_FS is not set | 628 | CONFIG_DEBUG_FS=y |
628 | # CONFIG_DEBUG_VM is not set | 629 | # CONFIG_DEBUG_VM is not set |
629 | CONFIG_FORCED_INLINING=y | 630 | CONFIG_FORCED_INLINING=y |
630 | # CONFIG_RCU_TORTURE_TEST is not set | 631 | # CONFIG_RCU_TORTURE_TEST is not set |