From: Robert P. J. Day Date: Tue, 21 Oct 2014 20:44:32 +0000 (-0400) Subject: Correct two non-functional misspellings "overrided". X-Git-Tag: KARO-TXA5-2015-06-26~411 X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=5699ea6d0ee01ab3e41d2cb2ebe2c56a24b9ffff Correct two non-functional misspellings "overrided". Signed-off-by: Robert P. J. Day --- diff --git a/dts/Kconfig b/dts/Kconfig index 83ba7a6e98..5fe63f8025 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -49,7 +49,7 @@ config DEFAULT_DEVICE_TREE string "Default Device Tree for DT control" help This option specifies the default Device Tree used for DT control. - It can be overrided from the command line: + It can be overridden from the command line: $ make DEVICE_TREE= endmenu 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)