diff --git a/[refs] b/[refs] index 13f3f26d8932..ef7edff0f88b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2ec98525d815d6e68dd509e5a4c9b93e55d622d +refs/heads/master: 20e482b6421cffa92942e2c4970c113667451205 diff --git a/trunk/arch/i386/boot/compressed/Makefile b/trunk/arch/i386/boot/compressed/Makefile index aa7f87318349..3f4289143e39 100644 --- a/trunk/arch/i386/boot/compressed/Makefile +++ b/trunk/arch/i386/boot/compressed/Makefile @@ -46,5 +46,5 @@ endif LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T -$(obj)/piggy.o: $(src)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE +$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.gz FORCE $(call if_changed,ld) diff --git a/trunk/arch/i386/boot/compressed/vmlinux.scr b/trunk/arch/i386/boot/compressed/vmlinux_32.scr similarity index 100% rename from trunk/arch/i386/boot/compressed/vmlinux.scr rename to trunk/arch/i386/boot/compressed/vmlinux_32.scr