diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2018-07-24 16:54:23 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-07-24 16:54:26 +0100 |
| commit | ba78d0104e4ce61135ffb26a39dac0d57b00824b (patch) | |
| tree | aeaa93c3b7febdc8bfa46510d93dd05c0e3747d3 /drivers/net/qede/Makefile | |
| parent | 6fce689301aa6be62eb0786519ff1eaf27bf00c8 (diff) | |
| parent | 43192222b329b3c984687235b0081c7fbfe484ba (diff) | |
Merge branch 'upstream-16.11-stable' into 16.11.x
Change-Id: I63e43d3cdc0ac549e2ff917005ccaeec9787b89e
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/net/qede/Makefile')
| -rw-r--r-- | drivers/net/qede/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile index 18150b58..323423ec 100644 --- a/drivers/net/qede/Makefile +++ b/drivers/net/qede/Makefile @@ -67,8 +67,8 @@ 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_BASE_DRIVER += -diag-disable 188 #188: enumerated type mixed with another type +CFLAGS_qede_ethdev.o += -diag-disable 279 #279: controlling expression is constant endif # |