diff options
Diffstat (limited to 'arch/um/defconfig')
-rw-r--r-- | arch/um/defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/defconfig b/arch/um/defconfig index a54d0efecae1..1e0f677c2f46 100644 --- a/arch/um/defconfig +++ b/arch/um/defconfig | |||
@@ -52,7 +52,6 @@ CONFIG_X86_WP_WORKS_OK=y | |||
52 | CONFIG_X86_INVLPG=y | 52 | CONFIG_X86_INVLPG=y |
53 | CONFIG_X86_BSWAP=y | 53 | CONFIG_X86_BSWAP=y |
54 | CONFIG_X86_POPAD_OK=y | 54 | CONFIG_X86_POPAD_OK=y |
55 | CONFIG_X86_CMPXCHG64=y | ||
56 | CONFIG_X86_GOOD_APIC=y | 55 | CONFIG_X86_GOOD_APIC=y |
57 | CONFIG_X86_USE_PPRO_CHECKSUM=y | 56 | CONFIG_X86_USE_PPRO_CHECKSUM=y |
58 | CONFIG_X86_TSC=y | 57 | CONFIG_X86_TSC=y |
@@ -189,7 +188,7 @@ CONFIG_XTERM_CHAN=y | |||
189 | # CONFIG_NOCONFIG_CHAN is not set | 188 | # CONFIG_NOCONFIG_CHAN is not set |
190 | CONFIG_CON_ZERO_CHAN="fd:0,fd:1" | 189 | CONFIG_CON_ZERO_CHAN="fd:0,fd:1" |
191 | CONFIG_CON_CHAN="xterm" | 190 | CONFIG_CON_CHAN="xterm" |
192 | CONFIG_SSL_CHAN="pty" | 191 | CONFIG_SSL_CHAN="pts" |
193 | CONFIG_UNIX98_PTYS=y | 192 | CONFIG_UNIX98_PTYS=y |
194 | CONFIG_LEGACY_PTYS=y | 193 | CONFIG_LEGACY_PTYS=y |
195 | CONFIG_LEGACY_PTY_COUNT=256 | 194 | CONFIG_LEGACY_PTY_COUNT=256 |
@@ -527,3 +526,4 @@ CONFIG_FORCED_INLINING=y | |||
527 | # CONFIG_RCU_TORTURE_TEST is not set | 526 | # CONFIG_RCU_TORTURE_TEST is not set |
528 | # CONFIG_GPROF is not set | 527 | # CONFIG_GPROF is not set |
529 | # CONFIG_GCOV is not set | 528 | # CONFIG_GCOV is not set |
529 | # CONFIG_DEBUG_STACK_USAGE is not set | ||