* 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.

diff --git a/ChangeLog b/ChangeLog
index c8e7546858b6f6c2743ec870d31fba36dcaa1bee..1a68f911c061352777abde3cbad8db314946aedc 100644 (file)
--- 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 6f0dce6ff9c04745a5093ff1f88f60747a03be4b..3fdf395b45e1c739f692da26574c04bb014a8770 100644 (file)
--- 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;
 };