Commit 77bf2bab authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Linus Torvalds
Browse files

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: default avatarJan Engelhardt <jengelh@computergmbh.de>
Cc: Bill Nottingham <notting@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b7c698f7

drivers/char/Kconfig

+0 −17
Original line number Original line Diff line number Diff line
@@ -36,23 +36,6 @@ config VT 
	  If unsure, say Y, or else you won't be able to do much with your new

	  If unsure, say Y, or else you won't be able to do much with your new

	  shiny Linux system :-)

	  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

config VT_CONSOLE

	bool "Support for console on virtual terminal" if EMBEDDED

	bool "Support for console on virtual terminal" if EMBEDDED

	depends on VT

	depends on VT

drivers/char/vt.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -158,11 +158,7 @@ static void blank_screen_t(unsigned long dummy); 
static void set_palette(struct vc_data *vc);

static void set_palette(struct vc_data *vc);





static int printable;		/* Is console ready for printing? */

static int printable;		/* Is console ready for printing? */

#ifdef CONFIG_VT_UNICODE

int default_utf8 = true;

int default_utf8 = 1;

#else

int default_utf8;

#endif

module_param(default_utf8, int, S_IRUGO | S_IWUSR);

module_param(default_utf8, int, S_IRUGO | S_IWUSR);





/*

/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE