]> git.baikalelectronics.ru Git - kernel.git/commit
s390/char: Rename EBCDIC keymap variables
authorFarhan Ali <alifm@linux.vnet.ibm.com>
Thu, 22 Feb 2018 16:22:23 +0000 (11:22 -0500)
committerChristian Borntraeger <borntraeger@de.ibm.com>
Wed, 14 Mar 2018 19:21:17 +0000 (19:21 +0000)
commit34a8e3923cf2ae0576ba2ec805ff3cc6e4d08afa
tree74b75b09b634821243802b1c5bb6ab31a5cce6c4
parent4e0eea294f575b56b17ad6e17947e611002bd2ea
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>
Acked-by: Heiko Carstens <heiko.carstens@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>
drivers/s390/char/defkeymap.c
drivers/s390/char/keyboard.c
drivers/s390/char/keyboard.h