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

	[!GRUB_MACHINE_MIPS_YEELOONG && !GRUB_MACHINE_QEMU]: Use scancode set 1.

diff --git a/ChangeLog b/ChangeLog
index 9fc7fdcf0260a783379ebc9ae7ee0c4fa6480f59..778d8614523c754fea6b9a1c7971322d46489380 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/term/at_keyboard.c (set_scancodes)
+       [!GRUB_MACHINE_MIPS_YEELOONG && !GRUB_MACHINE_QEMU]: Use scancode set 1.
+
 2011-03-30  Colin Watson  <cjwatson@ubuntu.com>
 
        * docs/grub.texi (Menu-specific commands): Remove some semantics

diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
index 55cb76483035dcdb55f174bd25f852c771d2d3b8..7ce287ecc3aab534547c6b0c3c9ab8f4e2742a6e 100644 (file)
--- a/grub-core/term/at_keyboard.c
+++ b/grub-core/term/at_keyboard.c
@@ -330,6 +330,11 @@ set_scancodes (void)
       return;
     }
 
+#if !(defined (GRUB_MACHINE_MIPS_YEELOONG) || defined (GRUB_MACHINE_QEMU))
+  current_set = 1;
+  return;
+#endif
+
   grub_keyboard_controller_write (grub_keyboard_controller_orig
                                  & ~KEYBOARD_AT_TRANSLATE);