From 1bd9b61222f3a81ffe770fc00b70ded6e760c42b Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Fri, 1 Jun 2018 09:09:08 +0200 Subject: New upstream version 18.05 Change-Id: Icd4170ddc4f63aeae5d0559490e5195b5349f9c2 Signed-off-by: Christian Ehrhardt --- drivers/net/qede/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'drivers/net/qede/Makefile') diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile index ccbffa45..c30a867e 100644 --- a/drivers/net/qede/Makefile +++ b/drivers/net/qede/Makefile @@ -1,6 +1,6 @@ -# Copyright (c) 2016 QLogic Corporation. +# Copyright (c) 2016 - 2018 Cavium Inc. # All rights reserved. -# www.qlogic.com +# www.cavium.com # # See LICENSE.qede_pmd for copyright and licensing details. @@ -73,8 +73,7 @@ ifeq ($(shell clang -Wno-pointer-bool-conversion -Werror -E - < /dev/null > /dev CFLAGS_BASE_DRIVER += -Wno-pointer-bool-conversion endif else #ICC -CFLAGS_BASE_DRIVER += -wd188 #188: enumerated type mixed with another type -CFLAGS_qede_ethdev.o += -wd279 #279: controlling expression is constant +CFLAGS_qede_ethdev.o += -diag-disable 279 #279: controlling expression is constant endif # -- cgit 1.2.3-korg