---

yaml
---
r: 71095
b: refs/heads/master
c: 77bf2ba
h: refs/heads/master
i:
  71093: 0c8eb3b
  71091: e36b559
  71087: ecf9de4
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7c698f755c843dec5c54bf89893c320b8fbdfce
+refs/heads/master: 77bf2bab91e4e7df361963451c7b9a803516438c

trunk/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

trunk/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);
 
 /*