diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-08 21:20:11 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-08 21:20:11 -0500 |
| commit | 6108209c4ae964836f6bac5210f1c64153800b62 (patch) | |
| tree | 83651902b46af6bbf8d2ea4841b397bac306095b /arch/mips | |
| parent | a1c6f05733c27ba7067c06c095f49e8732a5ae17 (diff) | |
| parent | a7f61e89af73e9bf760826b20dba4e637221fcb9 (diff) | |
Merge branch 'for-linus' into work.misc
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/vdso/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile index 018f8c7b94f2..14568900fc1d 100644 --- a/arch/mips/vdso/Makefile +++ b/arch/mips/vdso/Makefile @@ -26,7 +26,7 @@ aflags-vdso := $(ccflags-vdso) \ # the comments on that file. # ifndef CONFIG_CPU_MIPSR6 - ifeq ($(call ld-ifversion, -lt, 22500000, y),) + ifeq ($(call ld-ifversion, -lt, 22500000, y),y) $(warning MIPS VDSO requires binutils >= 2.25) obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y)) ccflags-vdso += -DDISABLE_MIPS_VDSO |