diff options
| author |   Farhan Ali <alifm@linux.vnet.ibm.com> | 2018-02-22 11:22:23 -0500 |
|---|---|---|
| committer |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-03-18 23:01:56 -0700 |
| commit | aa0f2dd4de202c185b1156b1d43eb23e457e9a3c (patch) | |
| tree | 604ecc42030b368fde1a68cd54c1a9624b9bee79 /drivers/s390/char/keyboard.h | |
| parent | Kconfig : Remove HAS_IOMEM dependency for Graphics support (diff) | |
| download | linux-dev-aa0f2dd4de202c185b1156b1d43eb23e457e9a3c.tar.xz linux-dev-aa0f2dd4de202c185b1156b1d43eb23e457e9a3c.zip | |
s390/char : Rename EBCDIC keymap variables
The Linux Virtual Terminal (VT) layer provides a default keymap
which is compiled when VT layer is enabled. But at the same time
we are also compiling the EBCDIC keymap and this causes the linker
to complain.
So let's rename the EBCDIC keymap variables to prevent linker
conflict.
Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <f670a2698d2372e1e990c48a29334ffe894804b1.1519315352.git.alifm@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/char/keyboard.h')
| -rw-r--r-- | drivers/s390/char/keyboard.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/s390/char/keyboard.h b/drivers/s390/char/keyboard.h index a074d9711628..c467589c7f45 100644 --- a/drivers/s390/char/keyboard.h +++ b/drivers/s390/char/keyboard.h @@ -14,6 +14,17 @@ struct kbd_data; +extern int ebc_funcbufsize, ebc_funcbufleft; +extern char *ebc_func_table[MAX_NR_FUNC]; +extern char ebc_func_buf[]; +extern char *ebc_funcbufptr; +extern unsigned int ebc_keymap_count; + +extern struct kbdiacruc ebc_accent_table[]; +extern unsigned int ebc_accent_table_size; +extern unsigned short *ebc_key_maps[MAX_NR_KEYMAPS]; +extern unsigned short ebc_plain_map[NR_KEYS]; + typedef void (fn_handler_fn)(struct kbd_data *); /* |