Correct two non-functional misspellings "overrided".
authorRobert P. J. Day <rpjday@crashcourse.ca>
Tue, 21 Oct 2014 20:44:32 +0000 (16:44 -0400)
committerTom Rini <trini@ti.com>
Mon, 27 Oct 2014 21:54:11 +0000 (17:54 -0400)
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
dts/Kconfig
scripts/kconfig/merge_config.sh

index 83ba7a6e9815a50990083565934442d81123a7e0..5fe63f8025879a7fca596cd403a409f601ca97e8 100644 (file)
@@ -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=<device-tree-name>
 
 endmenu
index 81b0c61bb9e2060c18fb9dd315e8a9e0ae8a195a..efa4733461981131ef385244ca30ed48a35f303f 100755 (executable)
@@ -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)