summaryrefslogtreecommitdiff
path: root/include/linux/consolemap.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2021-02-23 08:35:15 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2021-02-23 08:35:15 +0300
commitcbecf716ca618fd44feda6bd9a64a8179d031fc5 (patch)
tree186c9f69f0d11f773253c440dac85087f67288b7 /include/linux/consolemap.h
parent6524d8eac258452e547f8a49c8a965ac6dd8a161 (diff)
parent4c47097f8514e4b35a31e04e33172d0193cb38ed (diff)
downloadlinux-cbecf716ca618fd44feda6bd9a64a8179d031fc5.tar.xz
Merge branch 'next' into for-linus
Prepare input updates for 5.12 merge window.
Diffstat (limited to 'include/linux/consolemap.h')
-rw-r--r--include/linux/consolemap.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/consolemap.h b/include/linux/consolemap.h
index 254246673390..bcfce748c9d8 100644
--- a/include/linux/consolemap.h
+++ b/include/linux/consolemap.h
@@ -17,7 +17,8 @@
#ifdef CONFIG_CONSOLE_TRANSLATIONS
struct vc_data;
-extern u16 inverse_translate(struct vc_data *conp, int glyph, int use_unicode);
+extern u16 inverse_translate(const struct vc_data *conp, int glyph,
+ int use_unicode);
extern unsigned short *set_translate(int m, struct vc_data *vc);
extern int conv_uni_to_pc(struct vc_data *conp, long ucs);
extern u32 conv_8bit_to_uni(unsigned char c);