projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for...
[firefly-linux-kernel-4.4.55.git]
/
scripts
/
kconfig
/
merge_config.sh
diff --git
a/scripts/kconfig/merge_config.sh
b/scripts/kconfig/merge_config.sh
index 81b0c61bb9e2060c18fb9dd315e8a9e0ae8a195a..2ab91b9b100dc6f6cfba663d05580e14930a3def 100755
(executable)
--- a/
scripts/kconfig/merge_config.sh
+++ b/
scripts/kconfig/merge_config.sh
@@
-77,6
+77,11
@@
while true; do
esac
done
+if [ "$#" -lt 2 ] ; then
+ usage
+ exit
+fi
+
INITFILE=$1
shift;