aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-03 01:55:49 -0500
committerMichal Marek <mmarek@suse.cz>2015-02-25 08:59:14 -0500
commit4980bdf0213c9b5f876551b2ceb8ed8ece30deaf (patch)
tree0e5fa83f3ceef1e2c6e481feec8a464aa2d03463
parentc517d838eb7d07bbe9507871fab3931deccff539 (diff)
kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rwxr-xr-xscripts/kconfig/merge_config.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 2ab91b9b100d..2118af84e661 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -92,7 +92,7 @@ TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
92echo "Using $INITFILE as base" 92echo "Using $INITFILE as base"
93cat $INITFILE > $TMP_FILE 93cat $INITFILE > $TMP_FILE
94 94
95# Merge files, printing warnings on overrided values 95# Merge files, printing warnings on overridden values
96for MERGE_FILE in $MERGE_LIST ; do 96for MERGE_FILE in $MERGE_LIST ; do
97 echo "Merging $MERGE_FILE" 97 echo "Merging $MERGE_FILE"
98 CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE) 98 CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)