Merge remote-tracking branch 'cros/upstream' into 'cros/master'
Change-Id: Id4a940160443ec74211682facd5c32ab83c200d8
diff --git a/m4/compiler-warnings.m4 b/m4/compiler-warnings.m4
index 77b79c5..9d72297 100644
--- a/m4/compiler-warnings.m4
+++ b/m4/compiler-warnings.m4
@@ -11,7 +11,7 @@
-Wdeclaration-after-statement -Wstrict-prototypes \
-fno-strict-aliasing -Wno-deprecated-declarations \
-Wint-to-pointer-cast -Wfloat-equal -Wno-unused-parameter \
- -Wno-sign-compare -Wunused-but-set-variable \
+ -Wno-sign-compare -Wunused-variable -Wno-unused-function \
-Wundef -Wimplicit-function-declaration \
-Wpointer-arith -Winit-self -Wshadow \
-Wmissing-include-dirs -Waggregate-return \
