From: Gabriel de Perthuis <g2p.code@gmail.com>
Date: Wed, 14 Oct 2015 14:04:21 +0000 (+0200)
Subject: kconfig/merge_config.sh: Accept a single file
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2163e7b38fd56c058e664c8a09ccc14733dbc1b1;p=linux.git

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>
---

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 67653538e3220..67d1314476314 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