X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=e5ad5fd961771f10f4e9e94ca0fbeb4246f1dad4;hb=4bec62825b94dcfe7b9156fdc5af9381134b2bf8;hp=1ab3ebfc909198065a5d0b10a6e3ee0f1e768b3c;hpb=e857b33d1879fc4284e3151222eee2415c1de88a;p=linux-2.6-omap-h63xx.git

diff --git a/Makefile b/Makefile
index 1ab3ebfc909..e5ad5fd9617 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 29
-EXTRAVERSION =
+SUBLEVEL = 30
+EXTRAVERSION = -rc1
 NAME = Temporary Tasmanian Devil
 
 # *DOCUMENTATION*
@@ -533,8 +533,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
 endif
 
 # Force gcc to behave correct even for buggy distributions
-# Arch Makefiles may override this setting
+ifndef CONFIG_CC_STACKPROTECTOR
 KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
+endif
 
 ifdef CONFIG_FRAME_POINTER
 KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls