---

yaml --- r: 65430 b: refs/heads/master c: 16ae154 h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · df3ed07 · df3ed07
1 parent 31a5242
commit df3ed07
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20e482b6421cffa92942e2c4970c113667451205
+refs/heads/master: 16ae1544b763b33673f82d667b0f7699dd1274b9
diff --git a/trunk/arch/i386/boot/compressed/Makefile b/trunk/arch/i386/boot/compressed/Makefile
@@ -4,7 +4,7 @@
 # create a compressed vmlinux image from the original vmlinux
 #
 
-targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc_32.o piggy.o \
+targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head_32.o misc_32.o piggy.o \
 			vmlinux.bin.all vmlinux.relocs
 EXTRA_AFLAGS	:= -traditional
 
@@ -17,7 +17,7 @@ CFLAGS  := -m32 -D__KERNEL__ $(LINUX_INCLUDE) -O2 \
 	   $(call cc-option,-fno-stack-protector)
 LDFLAGS := -m elf_i386
 
-$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head.o $(obj)/misc_32.o $(obj)/piggy.o FORCE
+$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head_32.o $(obj)/misc_32.o $(obj)/piggy.o FORCE
 	$(call if_changed,ld)
 	@:
 

diff --git a/trunk/arch/i386/boot/compressed/head.S → trunk/arch/i386/boot/compressed/head_32.S b/trunk/arch/i386/boot/compressed/head.S → trunk/arch/i386/boot/compressed/head_32.S