]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
fix mismerge
authorVladimir Serbinenko <phcoder@gmail.com>
Mon, 8 May 2017 19:31:00 +0000 (21:31 +0200)
committerVladimir Serbinenko <phcoder@gmail.com>
Mon, 8 May 2017 19:31:00 +0000 (21:31 +0200)
grub-core/Makefile.core.def

index a8a64b076f817421e3b24ed30def009cab300bd8..f7b0b51c65919544f955b4f9cb83be2c0b0ec6e6 100644 (file)
@@ -167,10 +167,6 @@ kernel = {
   arm_coreboot = commands/keylayouts.c;
   arm_coreboot = kern/arm/coreboot/dma.c;
 
-  arm_coreboot = kern/arm/coreboot/init.c;
-  arm_coreboot = kern/arm/coreboot/timer.c;
-  arm_coreboot = kern/arm/coreboot/coreboot.S;
-
   terminfoinkernel = term/terminfo.c;
   terminfoinkernel = term/tparm.c;
   terminfoinkernel = commands/extcmd.c;