Merge branch 'drm-sti-next-add-dvo' of git://git.linaro.org/people/benjamin.gaignard...

[firefly-linux-kernel-4.4.55.git] / drivers / tty / vt / keyboard.c

diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index c039cfea5b112443e95a13ffc4a4ec0a2804772c..8a89f6e7715db19debaea61781dedc40d05597fc 100644 (file)
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -924,7 +924,7 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag)
 
        if (kbd->kbdmode != VC_UNICODE) {
                if (!up_flag)
-                       pr_warning("keyboard mode must be unicode for braille patterns\n");
+                       pr_warn("keyboard mode must be unicode for braille patterns\n");
                return;
        }
 
@@ -1253,8 +1253,8 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
        if (raw_mode && !hw_raw)
                if (emulate_raw(vc, keycode, !down << 7))
                        if (keycode < BTN_MISC && printk_ratelimit())
-                               pr_warning("can't emulate rawmode for keycode %d\n",
-                                          keycode);
+                               pr_warn("can't emulate rawmode for keycode %d\n",
+                                       keycode);
 
 #ifdef CONFIG_SPARC
        if (keycode == KEY_A && sparc_l1_a_state) {