From cd6b770c7083d398fcfe29958dfee85f2a50f45a Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 7 Mar 2013 12:32:20 -0800 Subject: [PATCH] compat-drivers: remove network/68-do-not-add-Werror.patch This was added by Hauke to try to avoid causing compile errors where old kernels had warnings enabled by default such as -Werror=unused-but-set-variable. This is a common error and enabling -Werror would make compilation fail. The following upstream patch however sould take care of this by disabling -Werror if *any* -W* flag is found on EXTRA_FLAGS: commit 6f56b06e74e2805577bf7940dc0fb17b3310d6b6 Author: Chen Gang Date: Wed Feb 27 14:55:06 2013 +0800 drivers/net/wireless/ath/wil6210: Makefile, only -Werror when no -W* in EXTRA_CFLAGS When make with EXTRA_CFLAGS=-W, it will report error. so give a check in Makefile. Signed-off-by: Chen Gang Acked-by: Vladimir Kondratiev Signed-off-by: John W. Linville The change was as follows: -subdir-ccflags-y += -Werror +ifeq (, $(findstring -W,$(EXTRA_CFLAGS))) + subdir-ccflags-y += -Werror +endif Since this is now upstream, just nuke this work around! Signed-off-by: Luis R. Rodriguez --- .../network/68-do-not-add-Werror.patch | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 patches/collateral-evolutions/network/68-do-not-add-Werror.patch diff --git a/patches/collateral-evolutions/network/68-do-not-add-Werror.patch b/patches/collateral-evolutions/network/68-do-not-add-Werror.patch deleted file mode 100644 index 066df6e03460..000000000000 --- a/patches/collateral-evolutions/network/68-do-not-add-Werror.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/drivers/net/wireless/ath/wil6210/Makefile -+++ b/drivers/net/wireless/ath/wil6210/Makefile -@@ -9,5 +9,4 @@ wil6210-objs += wmi.o - wil6210-objs += interrupt.o - wil6210-objs += txrx.o - --subdir-ccflags-y += -Werror - subdir-ccflags-y += -D__CHECK_ENDIAN__ -- 2.30.2