Merged a Makefile conflict.

b3dd37c5 · Jeff Dike · b5aa43ef · bbfcdd70 · b3dd37c5
Commit b3dd37c5 authored Nov 16, 2002 by Jeff Dike
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

arch/um/Makefile arch/um/Makefile +0 -2

No files found.
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -64,12 +64,10 @@ $(ARCH_DIR)/vmlinux.lds.S :

 prepare: $(ARCH_SYMLINKS) $(GEN_HEADERS)

-
 LDFLAGS_vmlinux = -r $(ARCH_DIR)/main.o

 vmlinux: $(ARCH_DIR)/main.o 

-
 $(ARCH_DIR)/uml.lds.s : $(ARCH_DIR)/uml.lds.S scripts FORCE
 	$(call if_changed_dep,as_s_S)