From daea4108cd78ef64e7baf5ccf630725e780259dc Mon Sep 17 00:00:00 2001
From: John Stultz <john.stultz@linaro.org>
Date: Tue, 10 Jan 2012 15:41:15 -0800
Subject: [PATCH] --- yaml --- r: 285821 b: refs/heads/master c:
 320d41bb1597799669bab28a047f9868dd754aca h: refs/heads/master i:   285819:
 cb5ed6d2fcd38b6d3eee8e9f47b9458d6e3a47d4 v: v3

---
 [refs]                                | 2 +-
 trunk/scripts/kconfig/merge_config.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index db6fb7e9c9ed..64ff343ebafa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0c0cda276b796e9c9710672b3bb4a737dbb4900
+refs/heads/master: 320d41bb1597799669bab28a047f9868dd754aca
diff --git a/trunk/scripts/kconfig/merge_config.sh b/trunk/scripts/kconfig/merge_config.sh
index 07bb8863577b..ceadf0e150cf 100644
--- a/trunk/scripts/kconfig/merge_config.sh
+++ b/trunk/scripts/kconfig/merge_config.sh
@@ -104,8 +104,8 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $ALLTARGET
 # Check all specified config values took (might have missed-dependency issues)
 for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
 
-	REQUESTED_VAL=$(sed -n "$SED_CONFIG_EXP" $TMP_FILE | grep -w -e "$CFG")
-	ACTUAL_VAL=$(sed -n "$SED_CONFIG_EXP" .config | grep -w -e "$CFG")
+	REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
+	ACTUAL_VAL=$(grep -w -e "$CFG" .config)
 	if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then
 		echo "Value requested for $CFG not in final .config"
 		echo "Requested value:  $REQUESTED_VAL"