diff --git a/[refs] b/[refs]
index 41c486f4ec3a..b662f798fadf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58238c81443a83922e07b409e54ec93ce909b6ac
+refs/heads/master: 49c57d254e691a45ade207c754ba09ca7129ed93
diff --git a/trunk/scripts/Makefile.build b/trunk/scripts/Makefile.build
index a0fd5029cfe7..d2b366c16b64 100644
--- a/trunk/scripts/Makefile.build
+++ b/trunk/scripts/Makefile.build
@@ -46,7 +46,7 @@ include $(kbuild-file)
 # If the save-* variables changed error out
 ifeq ($(KBUILD_NOPEDANTIC),)
         ifneq ("$(save-cflags)","$(CFLAGS)")
-                $(error CFLAGS was changed in "$(kbuild-file)". Fix it to use EXTRA_CFLAGS)
+                $(error CFLAGS was changed in "$(kbuild-file)". Fix it to use ccflags-y)
         endif
 endif