diff options
| author | David S. Miller | 2019-01-21 23:41:32 +0100 |
|---|---|---|
| committer | David S. Miller | 2019-01-21 23:41:32 +0100 |
| commit | fa7f3a8d56b38a3ed1880a3780afba82387da277 (patch) | |
| tree | a4628ee966f21963e5e97a6d1a227a3e8138183e /arch/ia64 | |
| parent | Merge branch 'mlxsw-spectrum_router-Add-GRE-tunnel-support-for-Spectrum-2' (diff) | |
| parent | Linux 5.0-rc3 (diff) | |
| download | kernel-qcow2-linux-fa7f3a8d56b38a3ed1880a3780afba82387da277.tar.gz kernel-qcow2-linux-fa7f3a8d56b38a3ed1880a3780afba82387da277.tar.xz kernel-qcow2-linux-fa7f3a8d56b38a3ed1880a3780afba82387da277.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Completely minor snmp doc conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/ia64')
| -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 |