From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 25 May 2010 10:39:03 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~648^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9c5186cf83ee1ee061ec6b15ce1895540026045;p=thirdparty%2Fgrub.git

merge with mainline
---

e9c5186cf83ee1ee061ec6b15ce1895540026045
diff --cc include/grub/dl.h
index fde2e3163,cf5da7fd5..9d5f2af2d
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@@ -101,7 -106,7 +101,7 @@@ grub_err_t EXPORT_FUNC(grub_dl_register
  grub_err_t grub_arch_dl_check_header (void *ehdr);
  grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
  
- #if defined (_mips) && ! GRUB_MACHINE_EMU
 -#if defined (_mips) && ! GRUB_NO_MODULES
++#if defined (_mips) && (! defined (GRUB_MACHINE_EMU) || ! GRUB_MACHINE_EMU)
  #define GRUB_LINKER_HAVE_INIT 1
  void grub_arch_dl_init_linker (void);
  #endif