diff options
| author | Sachin Nikam <snikam@nvidia.com> | 2013-03-06 19:12:15 +0530 |
|---|---|---|
| committer | Sachin Nikam <snikam@nvidia.com> | 2013-03-06 19:31:07 +0530 |
| commit | d3dd6b4227fe3e59df0a55f679ec196e4ccb1e3a (patch) | |
| tree | 0137a07ecab729a19cea68b671c88def5bf83a2d /arch/x86/boot/compressed/eboot.c | |
| parent | bb36790494c382ec26250f351c8cea76613f0f02 (diff) | |
| parent | 2713e2797a78a0fdda765bc5ad7fed41e94818ba (diff) | |
Merge branch 'linux-3.4.35' into rel-17
Bug 1243631
Change-Id: I915826047b2e20f0ad0a7d75df295c6cbf6e5b0a
Diffstat (limited to 'arch/x86/boot/compressed/eboot.c')
| -rw-r--r-- | arch/x86/boot/compressed/eboot.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index 0cdfc0d2315e..8bb90707cb55 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/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; |