From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 13 Dec 2011 00:36:09 +0000 (+0100)
Subject: 	* grub-core/term/at_keyboard.c (set_scancodes): Fix preprocessor
X-Git-Tag: 2.00~915
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53072f9b96ae2333382f64df95198d7bb1e5227d;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index f14ce3de2..088f6f848 100644
--- 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 b81e76230..bcd20d3ff 100644
--- 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