Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / scripts / config

diff --git a/scripts/config b/scripts/config
index 608d7fdb13e8d6ac901eaf99cc3b1b5df0a7cc95..a7c7c4b8e957311196f9b2eabef414ceaa144555 100755 (executable)
--- a/scripts/config
+++ b/scripts/config
@@ -10,8 +10,10 @@ commands:
        --enable|-e option   Enable option
        --disable|-d option  Disable option
        --module|-m option   Turn option into a module
-       --set-str option value
-                            Set option to "value"
+       --set-str option string
+                            Set option to "string"
+       --set-val option value
+                            Set option to value
        --state|-s option    Print state of option (n,y,m,undef)
 
        --enable-after|-E beforeopt option
@@ -86,7 +88,7 @@ while [ "$1" != "" ] ; do
                B=$ARG
                shift 2
                ;;
-       --*)
+       -*)
                checkarg "$1"
                shift
                ;;
@@ -109,6 +111,11 @@ while [ "$1" != "" ] ; do
                shift
                ;;
 
+       --set-val)
+               set_var "CONFIG_$ARG" "CONFIG_$ARG=$1"
+               shift
+               ;;
+
        --state|-s)
                if grep -q "# CONFIG_$ARG is not set" $FN ; then
                        echo n