Remove few bad hunks

diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
index 4d7929073eacc83e1619dc7601b9fafd0d319c5a..4d112811f0dd14dc476edb412b015461fc365e14 100644 (file)
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -692,7 +692,6 @@ grub_dl_unload (grub_dl_t mod)
   return 1;
 }
 
-#ifdef __ia64__
 /* Unload unneeded modules.  */
 void
 grub_dl_unload_unneeded (void)
@@ -712,4 +711,3 @@ grub_dl_unload_unneeded (void)
       p = p->next;
     }
 }
-#endif

diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c
index 61b261599867a4df11e38b3372a74f92cdf69f20..d9b4c338b3f8541562c889305b4a63c7a37b99c3 100644 (file)
--- a/grub-core/loader/ia64/efi/linux.c
+++ b/grub-core/loader/ia64/efi/linux.c
@@ -17,7 +17,6 @@
  */
 
 #include <grub/loader.h>
-#include <grub/machine/loader.h>
 #include <grub/file.h>
 #include <grub/disk.h>
 #include <grub/err.h>

diff --git a/include/grub/ia64/efi/loader.h b/include/grub/ia64/efi/loader.h
deleted file mode 100644 (file)
index 5471a81..0000000
--- a/include/grub/ia64/efi/loader.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GRUB_LOADER_MACHINE_HEADER
-#define GRUB_LOADER_MACHINE_HEADER     1
-
-/* It is necessary to export these functions, because normal mode commands
-   reuse rescue mode commands.  */
-void grub_rescue_cmd_linux (int argc, char *argv[]);
-void grub_rescue_cmd_initrd (int argc, char *argv[]);
-void grub_rescue_cmd_payload (int argc, char *argv[]);
-void grub_rescue_cmd_relocate (int argc, char *argv[]);
-void grub_rescue_cmd_fpswa (int argc, char *argv[]);
-
-#endif /* ! GRUB_LOADER_MACHINE_HEADER */