From 9a79fcf2c9b56bc85f9d104f947125aa73099c31 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 19 May 2011 12:13:18 +0200
Subject: [PATCH] 	* grub-core/Makefile.core.def (lsacpi): Fix ia64
 mismerge. 	(lsefisystab): Likewise. 	(lssal): Likewise. 
 (lsefimmap): Likewise. 	(hdparm): Enable on qemu-mips. 	(setjmp): Add
 ia64 nodist. 	(serial): Simplify tags.

---
 ChangeLog                   | 10 ++++++++++
 grub-core/Makefile.core.def | 13 +++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c8e754685..1a68f911c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/Makefile.core.def (lsacpi): Fix ia64 mismerge.
+	(lsefisystab): Likewise.
+	(lssal): Likewise.
+	(lsefimmap): Likewise.
+	(hdparm): Enable on qemu-mips.
+	(setjmp): Add ia64 nodist.
+	(serial): Simplify tags.
+
 2011-05-18  Colin Watson  <cjwatson@ubuntu.com>
 
 	* Makefile.util.def (grub-ofpathname): Install manual page.
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 6f0dce6ff..3fdf395b4 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -505,7 +505,7 @@ module = {
 
   common = commands/lsacpi.c;
 
-  enable = x86_efi;
+  enable = efi;
   enable = i386_pc;
   enable = i386_coreboot;
   enable = i386_multiboot;
@@ -516,7 +516,7 @@ module = {
 
   common = commands/efi/lsefisystab.c;
 
-  enable = x86_efi;
+  enable = efi;
 };
 
 module = {
@@ -524,7 +524,7 @@ module = {
 
   common = commands/efi/lssal.c;
 
-  enable = x86_efi;
+  enable = efi;
 };
 
 module = {
@@ -532,7 +532,7 @@ module = {
 
   common = commands/efi/lsefimmap.c;
 
-  enable = x86_efi;
+  enable = efi;
 };
 
 module = {
@@ -632,6 +632,7 @@ module = {
   common = commands/hdparm.c;
   common = lib/hexdump.c;
   enable = pci;
+  enable = mips_qemu_mips;
 };
 
 module = {
@@ -1197,6 +1198,7 @@ module = {
   extra_dist = lib/x86_64/setjmp.S;
   extra_dist = lib/sparc64/setjmp.S;
   extra_dist = lib/powerpc/setjmp.S;
+  extra_dist = lib/ia64/setjmp.S;
 };
 
 module = {
@@ -1421,8 +1423,7 @@ module = {
   x86 = term/ns8250.c;
 
   enable = emu;
-  enable = i386;
-  enable = x86_64_efi;
+  enable = x86;
   emu_condition = COND_GRUB_EMU_USB;
 };