From ea200bac97d15261f54c5bd5f6808bf0895f5913 Mon Sep 17 00:00:00 2001
From: James <james.mckenzie@citrix.com>
Date: Thu, 24 Oct 2013 14:29:06 +0100
Subject: tidy

---
 master/jmm/xen-multiboot | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/master/jmm/xen-multiboot b/master/jmm/xen-multiboot
index 52b3e89..ffd01ff 100644
--- a/master/jmm/xen-multiboot
+++ b/master/jmm/xen-multiboot
@@ -1,7 +1,7 @@
 Index: grub2/conf/i386-efi.rmk
 ===================================================================
 diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index d9e74b3..afd0e25 100644
+index d9e74b3..c315811 100644
 --- a/grub-core/loader/multiboot.c
 +++ b/grub-core/loader/multiboot.c
 @@ -33,6 +33,7 @@
@@ -20,15 +20,7 @@ index d9e74b3..afd0e25 100644
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -51,6 +53,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
- 
- struct grub_relocator *grub_multiboot_relocator = NULL;
- grub_uint32_t grub_multiboot_payload_eip;
-+
- #if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
- #define DEFAULT_VIDEO_MODE "text"
- #else
-@@ -63,6 +66,8 @@ static int console_required;
+@@ -63,6 +65,8 @@ static int console_required;
  static grub_dl_t my_mod;
  
  
@@ -37,7 +29,7 @@ index d9e74b3..afd0e25 100644
  /* Return the length of the Multiboot mmap that will be needed to allocate
     our platform's map.  */
  grub_uint32_t
-@@ -112,6 +117,34 @@ grub_multiboot_set_video_mode (void)
+@@ -112,6 +116,34 @@ grub_multiboot_set_video_mode (void)
  }
  
  static grub_err_t
@@ -72,7 +64,7 @@ index d9e74b3..afd0e25 100644
  grub_multiboot_boot (void)
  {
    grub_err_t err;
-@@ -213,6 +246,72 @@ grub_multiboot_set_console (int console_type, int accepted_consoles,
+@@ -213,6 +245,72 @@ grub_multiboot_set_console (int console_type, int accepted_consoles,
  }
  
  static grub_err_t
@@ -145,7 +137,7 @@ index d9e74b3..afd0e25 100644
  grub_cmd_multiboot (grub_command_t cmd __attribute__ ((unused)),
  		    int argc, char *argv[])
  {
-@@ -329,23 +428,32 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
+@@ -329,23 +427,32 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
    return GRUB_ERR_NONE;;
  }
  
-- 
cgit v1.2.3