diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 23:03:09 +0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 17:14:50 +0400 |
| commit | 858ba94499b4f48e9eb0be7cf0092f1ea9460fef (patch) | |
| tree | 8f7a2ba4dc97d771de8b710822dfd2579693220d /arch/um/Makefile | |
| parent | 27f85f12639fe821375a69900d96e0fbcc1450bf (diff) | |
| download | linux-858ba94499b4f48e9eb0be7cf0092f1ea9460fef.tar.xz | |
um: merge arch/um/sys-{i386,x86_64}/shared
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index c1218705c2d3..184494d890b6 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -25,9 +25,8 @@ 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 +ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(HEADER_ARCH)/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 # named - it's a common symbol in libpcap, so we get a binary which crashes. |