X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=scripts%2Fkconfig%2Fmerge_config.sh;h=efa4733461981131ef385244ca30ed48a35f303f;hb=c956662cc3e2475b451afa9a8b639c0ccc49d432;hp=81b0c61bb9e2060c18fb9dd315e8a9e0ae8a195a;hpb=dcdb61a084bd3840d0987a5d01ae506c11efca1b;p=u-boot

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 81b0c61bb9..efa4733461 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -87,7 +87,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)