projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c517d83)
kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Wed, 3 Dec 2014 06:55:49 +0000 (15:55 +0900)
committerMichal Marek <mmarek@suse.cz>
Wed, 25 Feb 2015 13:59:14 +0000 (14:59 +0100)
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
scripts/kconfig/merge_config.sh patch | blob | blame | history

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 2ab91b9b100dc6f6cfba663d05580e14930a3def..2118af84e661aa8df3e53e6c90e0921090ea72cd 100755 (executable)
--- 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)