From 0e3407ad411b8b0ca28c74296e9e97da6a5742e2 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@mars.(none)>
Date: Thu, 14 Jul 2005 20:28:49 +0000
Subject: [PATCH] --- yaml --- r: 7235 b: refs/heads/master c:
 946dc121d7d1c606f6bbeb8ae778963a1e2ff59c h: refs/heads/master i:   7233:
 fd7a9556d0b6ce3edfef04cebdf4f94b2432bc1a   7231:
 464e25f18d58840abe203da98adcc2a2f7631114 v: v3

---
 [refs]         | 2 +-
 trunk/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 90de42d7d8ca..fe743dbf6860 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a91f98a284321ffc9eb28ccfbf4329f7aa422f97
+refs/heads/master: 946dc121d7d1c606f6bbeb8ae778963a1e2ff59c
diff --git a/trunk/Makefile b/trunk/Makefile
index a8d41b7d549d..38384f898d61 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -779,7 +779,7 @@ endif
 # prepare1 creates a makefile if using a separate output directory
 prepare1: prepare2 outputmakefile
 
-prepare0: prepare1 include/linux/version.h $(objtree)/include/asm \
+prepare0: prepare1 include/linux/version.h include/asm \
                    include/config/MARKER
 ifneq ($(KBUILD_MODULES),)
 	$(Q)rm -rf $(MODVERDIR)
@@ -819,7 +819,7 @@ export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)
 #	hard to detect, but I suppose "make mrproper" is a good idea
 #	before switching between archs anyway.
 
-$(objtree)/include/asm:
+include/asm:
 	@echo '  SYMLINK $@ -> include/asm-$(ARCH)'
 	$(Q)if [ ! -d include ]; then mkdir -p include; fi;
 	@ln -fsn asm-$(ARCH) $@