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>
mariux64 · Feb 25, 2015 · 4980bdf · 4980bdf
1 parent c517d83
commit 4980bdf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
@@ -92,7 +92,7 @@ TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
 echo "Using $INITFILE as base"
 cat $INITFILE > $TMP_FILE
 
-# Merge files, printing warnings on overrided values
+# Merge files, printing warnings on overridden values
 for MERGE_FILE in $MERGE_LIST ; do
 	echo "Merging $MERGE_FILE"
 	CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)