diff --git a/[refs] b/[refs]
index 428fba5f5c76..b8a1a94afeeb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0463f3c7a353e4d082e825f01e2862ca0f7b34ce
+refs/heads/master: eb2cafa1d9026ced051601053885e260f8b8c099
diff --git a/trunk/Makefile b/trunk/Makefile
index c1348ef020ca..110db856e966 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -310,8 +310,8 @@ CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
 CFLAGS          := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
                    -fno-strict-aliasing -fno-common
 # Force gcc to behave correct even for buggy distributions
-CFLAGS          += $(call cc-option, -fno-stack-protector-all \
-                                     -fno-stack-protector)
+CFLAGS          += $(call cc-option, -fno-stack-protector)
+
 AFLAGS          := -D__ASSEMBLY__
 
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)