OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c517d83
)
kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
author
Masahiro Yamada
<yamada.m@jp.panasonic.com>
Wed, 3 Dec 2014 06:55:49 +0000
(15:55 +0900)
committer
Michal 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
|
history
diff --git
a/scripts/kconfig/merge_config.sh
b/scripts/kconfig/merge_config.sh
index
2ab91b9
..
2118af8
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 overrid
ed
values
+# Merge files, printing warnings on overrid
den
values
for MERGE_FILE in $MERGE_LIST ; do
echo "Merging $MERGE_FILE"
CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)