Some CML1 grammar fixes

 -Erik

diff --git a/modutils/config.in b/modutils/config.in
index 7a1d56c24803c3d101f1bfe0e57d3fc8c2c5ce1c..7fe7ec1951e7fda99b5ea3f625b0d28c3d30edc0 100644 (file)
--- a/modutils/config.in
+++ b/modutils/config.in
@@ -14,11 +14,11 @@ bool 'rmmod'            CONFIG_RMMOD
 
 if [ "$CONFIG_INSMOD" = "y" ]; then
     comment 'Module support options'
+    bool 'Support for older (pre 2.1) Linux kernels'           CONFIG_FEATURE_OLD_MODULE_INTERFACE
     if [ "$CONFIG_FEATURE_OLD_MODULE_INTERFACE" = "n" ] ; then
            define_bool CONFIG_FEATURE_NEW_MODULE_INTERFACE     y
     fi
     bool 'Support for new (post 2.1) kernels'                  CONFIG_FEATURE_NEW_MODULE_INTERFACE
-    bool 'Support for older (pre 2.1) Linux kernels'           CONFIG_FEATURE_OLD_MODULE_INTERFACE
     bool 'Support module version checking'                     CONFIG_FEATURE_INSMOD_VERSION_CHECKING
     bool 'Support image in kernel memory optimization (uClinux only)'          CONFIG_FEATURE_INSMOD_LOADINKMEM
 fi

diff --git a/shell/config.in b/shell/config.in
index d6a7f1686352326126ac0cfb05a89eea8245ced7..b34c238456615fdf3ebbf118b0fa71ac1530c53e 100644 (file)
--- a/shell/config.in
+++ b/shell/config.in
@@ -11,7 +11,8 @@ choice 'Choose your default shell' \
     hush                                    CONFIG_FEATURE_SH_IS_HUSH \
     lash                                    CONFIG_FEATURE_SH_IS_LASH \
     msh                                     CONFIG_FEATURE_SH_IS_MSH  \
-    none                                    CONFIG_FEATURE_SH_IS_NONE"
+    none                                    CONFIG_FEATURE_SH_IS_NONE" \
+    ash
 
 if [ "$CONFIG_FEATURE_SH_IS_ASH" = "y" ] ; then
        define_bool CONFIG_ASH  y

diff --git a/sysdeps/linux/config.in b/sysdeps/linux/config.in
index d799c94eac75b70b9c5b40dc87f9292a297e3522..c1860556d2f92bc2c657551704c8c7b0c033c2be 100644 (file)
--- a/sysdeps/linux/config.in
+++ b/sysdeps/linux/config.in
@@ -28,7 +28,6 @@ endmenu
 source archival/config.in
 source console-tools/config.in
 source editors/config.in
-source fileutils/config.in
 source findutils/config.in
 source init/config.in
 source miscutils/config.in
@@ -41,4 +40,5 @@ source shellutils/config.in
 source sysklogd/config.in
 source textutils/config.in
 source util-linux/config.in
+source fileutils/config.in
 

diff --git a/util-linux/config.in b/util-linux/config.in
index bcc99bbe11a20aa592290debe0e8c0497868e40a..25d0c5ad4237ef0e9d19d6a6cd1abfa2fd9ed360 100644 (file)
--- a/util-linux/config.in
+++ b/util-linux/config.in
@@ -43,7 +43,9 @@ bool 'swaponoff'          CONFIG_SWAPONOFF
 bool 'mount'               CONFIG_MOUNT
 if [ "$CONFIG_MOUNT" = "y" ]; then
     bool '  Support mounting nfs file systems'                 CONFIG_NFSMOUNT
-    bool '  Use devmtab instead of /proc (needs a patched kernel)'     CONFIG_FEATURE_USE_DEVPS_PATCH
+    if [ "$CONFIG_FEATURE_USE_DEVPS_PATCH" = "n" ]; then
+       bool '  Use devmtab instead of /proc (needs a patched kernel)'  CONFIG_FEATURE_USE_DEVPS_PATCH
+    fi
 fi
 bool 'umount'              CONFIG_UMOUNT
 if [ "$CONFIG_UMOUNT" = "y" ]; then