From: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/lguest/lguest.c |    8 --------
 1 file changed, 8 deletions(-)

diff -puN drivers/lguest/lguest.c~git-newsetup-fixup drivers/lguest/lguest.c
--- a/drivers/lguest/lguest.c~git-newsetup-fixup
+++ a/drivers/lguest/lguest.c
@@ -888,17 +888,9 @@ static __init char *lguest_memory_setup(
 	 * before start_kernel() */
 	atomic_notifier_chain_register(&panic_notifier_list, &paniced);
 
-<<<<<<< HEAD/drivers/lguest/lguest.c
-	/* The Linux bootloader header contains an "e820" memory map: the
-	 * Launcher populated the first entry with our memory limit. */
-	add_memory_region(E820_MAP->addr, E820_MAP->size, E820_MAP->type);
-
-	/* This string is for the boot messages. */
-=======
 	add_memory_region(boot_params.e820_map[0].addr,
 			  boot_params.e820_map[0].size,
 			  boot_params.e820_map[0].type);
->>>>>>> /drivers/lguest/lguest.c
 	return "LGUEST";
 }
 
_