Merge tag 'backport/v3.14.24-ltsi-rc1/mach-shmobile-for-hdmi-20141211' into backport...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index 0d499e6..de8d637 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 14
-SUBLEVEL = 6
-EXTRAVERSION =
+SUBLEVEL = 26
+EXTRAVERSION = -ltsi
 NAME = Remembering Coco
 
 # *DOCUMENTATION*
@@ -639,6 +639,8 @@ KBUILD_CFLAGS       += -fomit-frame-pointer
 endif
 endif
 
+KBUILD_CFLAGS   += $(call cc-option, -fno-var-tracking-assignments)
+
 ifdef CONFIG_DEBUG_INFO
 KBUILD_CFLAGS  += -g
 KBUILD_AFLAGS  += -Wa,--gdwarf-2