Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1ddb482 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge commit 'efi-for-3.7-v2' into x86/urgent

parents ddd32b42 0f905a43

arch/x86/boot/compressed/eboot.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

arch/x86/boot/header.S

+0 −3
Original line number Diff line number Diff line
@@ -476,6 +476,3 @@ die: 
setup_corrupt:

	.byte	7

	.string	"No setup signature found...\n"
 


	.data

dummy:	.long	0