[PATCH 2/2] merge_config.sh: add -? for help

[Olof Johansson <olof@lixom.net>]

It's usual enough for help text that it makes sense to support it.

Signed-off-by: Olof Johansson <olof@lixom.net>
---
 scripts/kconfig/merge_config.sh |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 2ab91b9..0c89537 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -28,11 +28,11 @@ trap clean_up HUP INT TERM
 
 usage() {
 	echo "Usage: $0 [OPTIONS] [CONFIG [...]]"
-	echo "  -h    display this help text"
-	echo "  -m    only merge the fragments, do not execute the make command"
-	echo "  -n    use allnoconfig instead of alldefconfig"
-	echo "  -r    list redundant entries when merging fragments"
-	echo "  -O    dir to put generated output files"
+	echo "  -h or -? display this help text"
+	echo "  -m       only merge the fragments, do not execute the make command"
+	echo "  -n       use allnoconfig instead of alldefconfig"
+	echo "  -r       list redundant entries when merging fragments"
+	echo "  -O       dir to put generated output files"
 }
 
 MAKE=true
@@ -52,7 +52,7 @@ while true; do
 		shift
 		continue
 		;;
-	"-h")
+	"-h"|"-?")
 		usage
 		exit
 		;;
-- 
1.7.10.4