diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-19 11:42:32 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-19 11:42:32 -0800 |
commit | cdc7ef8981317cfa9a462b784935e4d2705c6776 (patch) | |
tree | b81a0424a333e72a6223b5764ccde0c8ea36549b /arch/um/Kconfig.char | |
parent | 9066d9b250679f259f06c10f489dfdfa75fb54dd (diff) | |
parent | 33a7d42999b1857d4494f6ad6367e3aef0ae8137 (diff) | |
download | linux-cdc7ef8981317cfa9a462b784935e4d2705c6776.tar.gz linux-cdc7ef8981317cfa9a462b784935e4d2705c6776.tar.bz2 linux-cdc7ef8981317cfa9a462b784935e4d2705c6776.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML changes from Richard Weinberger:
"This pile contains a nice defconfig cleanup, a rewritten stack
unwinder and various cleanups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Remove unused declarations from <as-layout.h>
um: remove used STDIO_CONSOLE Kconfig param
um/vdso: add .gitignore for a couple of targets
arch/um: make it work with defconfig and x86_64
um: Make kstack_depth_to_print conform to arch/x86
um: Get rid of thread_struct->saved_task
um: Make stack trace reliable against kernel mode faults
um: Rewrite show_stack()
Diffstat (limited to 'arch/um/Kconfig.char')
-rw-r--r-- | arch/um/Kconfig.char | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/um/Kconfig.char b/arch/um/Kconfig.char index b9d7c4276682..f10738d68b2d 100644 --- a/arch/um/Kconfig.char +++ b/arch/um/Kconfig.char @@ -6,10 +6,6 @@ config STDERR_CONSOLE help console driver which dumps all printk messages to stderr. -config STDIO_CONSOLE - bool - default y - config SSL bool "Virtual serial line" help |