summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-08-18 04:54:36 -0400
committerH. Peter Anvin <hpa@zytor.com>2008-10-22 22:55:21 -0700
commit6b0eed4ef3d024c3a709fbc3bb45ee5b0ac8486d (patch)
tree3606cc09e1bcd28e9b6758b2124aba7220e58c7a /arch/um
parentfe1cd9876fa6250a8eb3ae138917a2040eca2c47 (diff)
x86, um: get rid of uml asm/arch
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/Makefile13
-rw-r--r--arch/um/include/asm/string.h7
2 files changed, 2 insertions, 18 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 11cb7baa0fee..fac25e202120 100644
--- a/arch/um/Makefile
+++ b/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/arch/um/include/asm/string.h b/arch/um/include/asm/string.h
deleted file mode 100644
index 9a0571f6dd61..000000000000
--- a/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