diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 20:02:59 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 14:14:50 +0100 |
| commit | 27f85f12639fe821375a69900d96e0fbcc1450bf (patch) | |
| tree | 9ca3ae7471b85059cd2c458569d3fc117c2ca670 /arch/um/Makefile | |
| parent | 3655c4d3c4bc105a36080c665b7294f471b0a1de (diff) | |
| download | linux-3.10-27f85f12639fe821375a69900d96e0fbcc1450bf.tar.gz linux-3.10-27f85f12639fe821375a69900d96e0fbcc1450bf.tar.bz2 linux-3.10-27f85f12639fe821375a69900d96e0fbcc1450bf.zip | |
um: merge arch/um/sys-{i386,x86_64}/asm
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/Makefile')
| -rw-r--r-- | arch/um/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 649aebcc6a4..c1218705c2d 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -21,10 +21,12 @@ core-y += $(ARCH_DIR)/kernel/ \ MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas include $(srctree)/$(ARCH_DIR)/Makefile-skas +include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH) SHARED_HEADERS := $(ARCH_DIR)/include/shared ARCH_INCLUDE := -I$(srctree)/$(SHARED_HEADERS) ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared +KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(HEADER_ARCH) KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so @@ -46,8 +48,6 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\ $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \ $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include -include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH) - #This will adjust *FLAGS accordingly to the platform. include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS) |