summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorGabriel de Perthuis <g2p.code@gmail.com>2015-10-14 16:04:21 +0200
committerMichal Marek <mmarek@suse.com>2015-10-14 16:19:37 +0200
commit2163e7b38fd56c058e664c8a09ccc14733dbc1b1 (patch)
tree9c016f524968a776c86d8f04b59d9ac0634a336e /scripts
parented94fea5ba78d03808576f14745d8e59126489bd (diff)
downloadlinux-stable-2163e7b38fd56c058e664c8a09ccc14733dbc1b1.tar.gz
linux-stable-2163e7b38fd56c058e664c8a09ccc14733dbc1b1.tar.bz2
linux-stable-2163e7b38fd56c058e664c8a09ccc14733dbc1b1.zip
kconfig/merge_config.sh: Accept a single file
merge_config.sh can usefully be applied to a single file. It implicitly merges with the default configuration. Signed-off-by: Gabriel de Perthuis <g2p.code@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/kconfig/merge_config.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 67653538e322..67d131447631 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -77,7 +77,7 @@ while true; do
esac
done
-if [ "$#" -lt 2 ] ; then
+if [ "$#" -lt 1 ] ; then
usage
exit
fi