* grub-core/term/at_keyboard.c (set_scancodes): Fix preprocessor

	conditionals.

diff --git a/ChangeLog b/ChangeLog
index f14ce3de2e8db59fd0ea035e2c4eb5bc84dffeb5..088f6f848152c9956b2a98ad1a8c1a3d5c54f90f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/term/at_keyboard.c (set_scancodes): Fix preprocessor
+       conditionals.
+
 2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/emu/main.c (main): Add missing const qualifier.

diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
index b81e76230b58d032a820225dbb7d1b8b59210e2d..bcd20d3ff247af1e1516b0fb2c0c5ce4790bd278 100644 (file)
--- a/grub-core/term/at_keyboard.c
+++ b/grub-core/term/at_keyboard.c
@@ -332,10 +332,10 @@ set_scancodes (void)
       return;
     }
 
-#if !(defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_QEMU))
+#if !(defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_QEMU) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS))
   current_set = 1;
   return;
-#endif
+#else
 
   grub_keyboard_controller_write (grub_keyboard_controller_orig
                                  & ~KEYBOARD_AT_TRANSLATE);
@@ -352,6 +352,7 @@ set_scancodes (void)
   if (current_set == 1)
     return;
   grub_printf ("No supported scancode set found\n");
+#endif
 }
 
 static void