diff --git a/[refs] b/[refs] index a46ee2af8852..3bf977af360f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4290fcfd7391886c84e7e28ef2ac1125c15154f8 +refs/heads/master: e5e96ef2899fb9d6009a53f83952e00cad2a97ab diff --git a/trunk/arch/x86_64/boot/compressed/Makefile b/trunk/arch/x86_64/boot/compressed/Makefile index 6b2fb9906664..6fb949582b23 100644 --- a/trunk/arch/x86_64/boot/compressed/Makefile +++ b/trunk/arch/x86_64/boot/compressed/Makefile @@ -26,5 +26,5 @@ $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T -$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE +$(obj)/piggy.o: $(obj)/vmlinux_64.scr $(obj)/vmlinux.bin.gz FORCE $(call if_changed,ld) diff --git a/trunk/arch/x86_64/boot/compressed/vmlinux.scr b/trunk/arch/x86_64/boot/compressed/vmlinux_64.scr similarity index 100% rename from trunk/arch/x86_64/boot/compressed/vmlinux.scr rename to trunk/arch/x86_64/boot/compressed/vmlinux_64.scr