diff options
| author | Jan Engelhardt <jengelh@computergmbh.de> | 2007-10-18 03:04:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 14:37:17 -0700 |
| commit | 77bf2bab91e4e7df361963451c7b9a803516438c (patch) | |
| tree | a574c2a323880a21fa90c7c5a3b8bc23392d50da /drivers | |
| parent | b7c698f755c843dec5c54bf89893c320b8fbdfce (diff) | |
| download | op-kernel-dev-77bf2bab91e4e7df361963451c7b9a803516438c.zip op-kernel-dev-77bf2bab91e4e7df361963451c7b9a803516438c.tar.gz | |
Remove CONFIG_VT_UNICODE
Since default_utf8 is already a sysfs attribute, having an extra
CONFIG_VT_UNICODE compile-time option is redundant, since sysfs attributes can
be set at boot and run time.
Also let Linux VCs default to UTF-8 (as per the discussion at
http://lkml.org/lkml/2007/9/6/99).
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Cc: Bill Nottingham <notting@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/Kconfig | 17 | ||||
| -rw-r--r-- | drivers/char/vt.c | 6 |
2 files changed, 1 insertions, 22 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 204d53e..4dbee61 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -36,23 +36,6 @@ config VT If unsure, say Y, or else you won't be able to do much with your new shiny Linux system :-) -config VT_UNICODE - bool "Virtual console is Unicode by default" - depends on VT - default n - ---help--- - If you say Y here, the virtual terminal will be in UTF-8 by default, - and the keyboard will run in unicode mode. - - If you say N here, the virtual terminal will not be in UTF-8 by - default, and the keyboard will run in XLATE mode. - - This can also be changed by passing 'default_utf8=<0|1>' on the - kernel command line. - - Historically, the kernel has defaulted to non-UTF8 and XLATE mode. - If unsure, say N here. - config VT_CONSOLE bool "Support for console on virtual terminal" if EMBEDDED depends on VT diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 645ad98..1764c67 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -158,11 +158,7 @@ static void blank_screen_t(unsigned long dummy); static void set_palette(struct vc_data *vc); static int printable; /* Is console ready for printing? */ -#ifdef CONFIG_VT_UNICODE -int default_utf8 = 1; -#else -int default_utf8; -#endif +int default_utf8 = true; module_param(default_utf8, int, S_IRUGO | S_IWUSR); /* |
