diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:17:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:17:02 +0100 |
| commit | d61b5d546af21e886aafcc9182f5ac5935a3177d (patch) | |
| tree | 448b389768a74efb604dd22ea2a5d43686ea3be5 /arch/ia64/Makefile | |
| parent | 94832d93992176b7c37672e1fc7b7acc16e70286 (diff) | |
| parent | f17b5f06cb92ef2250513a1e154c47b78df07d40 (diff) | |
Merge 5.0-rc4 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/ia64/Makefile')
| -rw-r--r-- | arch/ia64/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 320d86f192ee..171290f9f1de 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile @@ -16,8 +16,6 @@ KBUILD_DEFCONFIG := generic_defconfig NM := $(CROSS_COMPILE)nm -B READELF := $(CROSS_COMPILE)readelf -export AWK - CHECKFLAGS += -D__ia64=1 -D__ia64__=1 -D_LP64 -D__LP64__ OBJCOPYFLAGS := --strip-all |