From ac0a6168ba5f730661a55b48bdcc93268a4b79ff Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt.fleming@intel.com>
Date: Tue, 20 Nov 2012 13:07:46 +0000
Subject: [PATCH] --- yaml --- r: 336002 b: refs/heads/master c:
 0f905a43ce955b638139bd84486194770a6a2c08 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/boot/compressed/eboot.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b91098abda49..50c6dd11da87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caaa8c6339ccefee6e834c4a8b0bec7e721e7357
+refs/heads/master: 0f905a43ce955b638139bd84486194770a6a2c08
diff --git a/trunk/arch/x86/boot/compressed/eboot.c b/trunk/arch/x86/boot/compressed/eboot.c
index c760e073963e..e87b0cac14b5 100644
--- a/trunk/arch/x86/boot/compressed/eboot.c
+++ b/trunk/arch/x86/boot/compressed/eboot.c
@@ -12,6 +12,8 @@
 #include <asm/setup.h>
 #include <asm/desc.h>
 
+#undef memcpy			/* Use memcpy from misc.c */
+
 #include "eboot.h"
 
 static efi_system_table_t *sys_table;