From 9f2cd51f1a8528ac20556c2acaf2584f61dc3894 Mon Sep 17 00:00:00 2001
From: Arnaud Lacombe <lacombar@gmail.com>
Date: Mon, 15 Aug 2011 01:07:13 -0400
Subject: [PATCH] --- yaml --- r: 274286 b: refs/heads/master c:
 49c57d254e691a45ade207c754ba09ca7129ed93 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/scripts/Makefile.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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