aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-06-02 12:19:00 +0800
committerAlex Shi <alex.shi@linaro.org>2016-06-02 12:19:00 +0800
commit591f619b47eeb197aea4a40ea1cfd786ae4d68b3 (patch)
tree7f727e6a678a22e20de2063e5ec5b3cf165eae0a /Makefile
parent1d53a9c6e6c7bc32ecfbbb024ab7a1955122c526 (diff)
parent37aa27cffb68b92b8f42d1a9f6300ed758d07552 (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rt
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 9e75b50c23c8..920945782cde 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 4
-SUBLEVEL = 11
+SUBLEVEL = 12
EXTRAVERSION =
NAME = Blurry Fish Butt
@@ -682,9 +682,10 @@ KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
else
-# This warning generated too much noise in a regular build.
-# Use make W=1 to enable this warning (see scripts/Makefile.build)
+# These warnings generated too much noise in a regular build.
+# Use make W=1 to enable them (see scripts/Makefile.build)
KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
+KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
endif
ifdef CONFIG_FRAME_POINTER