Update to 3.4-final.

[linux-flexiantxendom0-3.2.10.git] / drivers / tty / vt / keyboard.c

diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index 3b0c4e3..d0fbb40 100644 (file)
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -45,6 +45,8 @@
 
 #include <asm/irq_regs.h>
 
+#include <linux/bootsplash.h>
+
 extern void ctrl_alt_del(void);
 
 /*
@@ -1292,6 +1294,13 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
                                pr_warning("can't emulate rawmode for keycode %d\n",
                                           keycode);
 
+       /* This code has to be redone for some non-x86 platforms */
+       if (down == 1 && (keycode == 0x3c || keycode == 0x01)) {
+               /* F2 and ESC on PC keyboard */
+               if (splash_verbose())
+                       return;
+       }
+
 #ifdef CONFIG_SPARC
        if (keycode == KEY_A && sparc_l1_a_state) {
                sparc_l1_a_state = false;