Merge tag 'tty-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[uclinux-h8/linux.git] / drivers / s390 / char / keyboard.c

diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index bbb3001..567aedc 100644 (file)
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -39,8 +39,34 @@ static const int kbd_max_vals[] = {
 };
 static const int KBD_NR_TYPES = ARRAY_SIZE(kbd_max_vals);
 
-static unsigned char ret_diacr[NR_DEAD] = {
-       '`', '\'', '^', '~', '"', ','
+static const unsigned char ret_diacr[NR_DEAD] = {
+       '`',    /* dead_grave */
+       '\'',   /* dead_acute */
+       '^',    /* dead_circumflex */
+       '~',    /* dead_tilda */
+       '"',    /* dead_diaeresis */
+       ',',    /* dead_cedilla */
+       '_',    /* dead_macron */
+       'U',    /* dead_breve */
+       '.',    /* dead_abovedot */
+       '*',    /* dead_abovering */
+       '=',    /* dead_doubleacute */
+       'c',    /* dead_caron */
+       'k',    /* dead_ogonek */
+       'i',    /* dead_iota */
+       '#',    /* dead_voiced_sound */
+       'o',    /* dead_semivoiced_sound */
+       '!',    /* dead_belowdot */
+       '?',    /* dead_hook */
+       '+',    /* dead_horn */
+       '-',    /* dead_stroke */
+       ')',    /* dead_abovecomma */
+       '(',    /* dead_abovereversedcomma */
+       ':',    /* dead_doublegrave */
+       'n',    /* dead_invertedbreve */
+       ';',    /* dead_belowcomma */
+       '$',    /* dead_currency */
+       '@',    /* dead_greek */
 };
 
 /*