[PATCH 2/2] kconfig/merge_config.sh: Accept a single file

[Gabriel de Perthuis <g2p.code@gmail.com>]

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>
Cc: Michal Marek <mmarek@suse.cz>
---
  scripts/kconfig/merge_config.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/kconfig/merge_config.sh 
b/scripts/kconfig/merge_config.sh
index 5f1e110..4e16681 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -75,11 +75,11 @@ while true; do
  		break
  		;;
  	esac
  done
  -if [ "$#" -lt 2 ] ; then
+if [ "$#" -lt 1 ] ; then
  	usage
  	exit
  fi
   INITFILE=$1
-- 
2.6.0.rc0.29.g24f8d8a