From 152237368d8f067d0c304f8e0adb25e33d868e21 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 18 Aug 2008 04:54:36 -0400
Subject: [PATCH] --- yaml --- r: 117431 b: refs/heads/master c:
 6b0eed4ef3d024c3a709fbc3bb45ee5b0ac8486d h: refs/heads/master i:   117429:
 f1681c136bb8bebb72e4f72cb73f70193799e4a9   117427:
 55eae69c6320f5c4c081299ff7021c9486254395   117423:
 dea880451ed8017cb3de015ec3e4cc3e3ea39f98 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/um/Makefile             | 13 ++-----------
 trunk/arch/um/include/asm/string.h |  7 -------
 3 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 trunk/arch/um/include/asm/string.h

diff --git a/[refs] b/[refs]
index 8d791f051f35..36c9104d3a4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe1cd9876fa6250a8eb3ae138917a2040eca2c47
+refs/heads/master: 6b0eed4ef3d024c3a709fbc3bb45ee5b0ac8486d
diff --git a/trunk/arch/um/Makefile b/trunk/arch/um/Makefile
index 11cb7baa0fee..fac25e202120 100644
--- a/trunk/arch/um/Makefile
+++ b/trunk/arch/um/Makefile
@@ -28,7 +28,7 @@ SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$
 #
 # These are cleaned up during mrproper. Please DO NOT fix it again, this is
 # the Correct Thing(tm) to do!
-ARCH_SYMLINKS = $(ARCH_DIR)/include/asm/arch $(ARCH_DIR)/include/shared/sysdep $(ARCH_DIR)/os \
+ARCH_SYMLINKS = $(ARCH_DIR)/include/shared/sysdep $(ARCH_DIR)/os \
 	$(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/uml-config.h
 
 MODE_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/include/shared/skas
@@ -38,7 +38,7 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas
 ARCH_INCLUDE	:= -I$(ARCH_DIR)/include/shared
 ifneq ($(KBUILD_SRC),)
 ARCH_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/include/shared
-KBUILD_CPPFLAGS += -I$(ARCH_DIR)/include # for arch symlink
+KBUILD_CPPFLAGS	+= -I$(ARCH_DIR)/include # for SYMLINK_HEADERS
 endif
 SYS_DIR		:= $(ARCH_DIR)/include/shared/sysdep-$(SUBARCH)
 
@@ -154,15 +154,6 @@ else
 	$(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
 endif
 
-$(ARCH_DIR)/include/asm/arch:
-	@echo '  SYMLINK $@'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm
-	$(Q)ln -fsn $(srctree)/arch/$(HEADER_ARCH)/include/asm $@
-else
-	$(Q)ln -fsn ../../../$(HEADER_ARCH)/include/asm $@
-endif
-
 $(objtree)/$(ARCH_DIR)/include/shared:
 	@echo '  MKDIR $@'
 	$(Q)mkdir -p $@
diff --git a/trunk/arch/um/include/asm/string.h b/trunk/arch/um/include/asm/string.h
deleted file mode 100644
index 9a0571f6dd61..000000000000
--- a/trunk/arch/um/include/asm/string.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __UM_STRING_H
-#define __UM_STRING_H
-
-#include "asm/arch/string.h"
-#include "asm/archparam.h"
-
-#endif