diff options
| author | Gabriel de Perthuis <g2p.code@gmail.com> | 2015-10-14 10:04:21 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.com> | 2015-10-14 10:19:37 -0400 |
| commit | 2163e7b38fd56c058e664c8a09ccc14733dbc1b1 (patch) | |
| tree | 9c016f524968a776c86d8f04b59d9ac0634a336e /scripts/kconfig | |
| parent | ed94fea5ba78d03808576f14745d8e59126489bd (diff) | |
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/kconfig')
| -rwxr-xr-x | scripts/kconfig/merge_config.sh | 2 |
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 | |||
| 77 | esac | 77 | esac |
| 78 | done | 78 | done |
| 79 | 79 | ||
| 80 | if [ "$#" -lt 2 ] ; then | 80 | if [ "$#" -lt 1 ] ; then |
| 81 | usage | 81 | usage |
| 82 | exit | 82 | exit |
| 83 | fi | 83 | fi |