From 464e25f18d58840abe203da98adcc2a2f7631114 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@mars.(none)>
Date: Thu, 14 Jul 2005 20:22:39 +0000
Subject: [PATCH] --- yaml --- r: 7231 b: refs/heads/master c:
 d80e22460968ec7986c82fd7d207ebe3de59e03d h: refs/heads/master i:   7229:
 4e7980aba35adebb2347229ddba02557c471fa05   7227:
 e8ff6a1280731acf894627ef98cc399d740fa1d2   7223:
 0ab35b2a026b35a01bb83a0e3b2b0f99adb9b2a7   7215:
 4604446b25d3b71246f55a809fac3e2c986d4062   7199:
 0463b1174cdfe9bfda156e5adf255b1645e67f13   7167:
 4561ccd15ea6c93158b7673001941c678ccc34da v: v3

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

diff --git a/[refs] b/[refs]
index 8cbc3343d255..7d1ea88c3304 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5f75eca120de6587e67a1951ce3e6912e2c6879
+refs/heads/master: d80e22460968ec7986c82fd7d207ebe3de59e03d
diff --git a/trunk/Makefile b/trunk/Makefile
index 5d0ecf11bfa0..a8d41b7d549d 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -767,7 +767,7 @@ $(vmlinux-dirs): prepare-all scripts
 prepare2:
 ifneq ($(KBUILD_SRC),)
 	@echo '  Using $(srctree) as source for kernel'
-	$(Q)if [ -h $(srctree)/include/asm -o -f $(srctree)/.config ]; then \
+	$(Q)if [ -f $(srctree)/.config ]; then \
 		echo "  $(srctree) is not clean, please run 'make mrproper'";\
 		echo "  in the '$(srctree)' directory.";\
 		/bin/false; \
@@ -779,7 +779,8 @@ endif
 # prepare1 creates a makefile if using a separate output directory
 prepare1: prepare2 outputmakefile
 
-prepare0: prepare1 include/linux/version.h include/asm include/config/MARKER
+prepare0: prepare1 include/linux/version.h $(objtree)/include/asm \
+                   include/config/MARKER
 ifneq ($(KBUILD_MODULES),)
 	$(Q)rm -rf $(MODVERDIR)
 	$(Q)mkdir -p $(MODVERDIR)
@@ -818,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.
 
-include/asm:
+$(objtree)/include/asm:
 	@echo '  SYMLINK $@ -> include/asm-$(ARCH)'
 	$(Q)if [ ! -d include ]; then mkdir -p include; fi;
 	@ln -fsn asm-$(ARCH) $@