diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-11 11:15:17 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-11 11:15:17 +0100 |
| commit | 2ab43784187e124e517e361e342e3b482e99d6d0 (patch) | |
| tree | bf6f7a7a178b6174e6590c62311ac3a15f6eba8b /target | |
| parent | e40eb0da36368624306275725d8e1d6b25422762 (diff) | |
| parent | 8f148a08f29ccb6c21f108549e20aa8e0bb04b79 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.runtime | 11 | ||||
| -rw-r--r-- | target/linux/config/Config.in.watchdog | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 3634564ed..7848a25ce 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -77,7 +77,7 @@ prompt "Initial login shell for the root user" default ADK_ROOTSH_MKSH config ADK_ROOTSH_MKSH - select ADK_PACKAGE_MKSH + select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY bool "mksh (MirBSD Korn Shell)" help Use mksh (a Korn Shell variant) as standard login shell @@ -97,13 +97,6 @@ config ADK_ROOTSH_BASH help Use GNU bash as standard login shell for the superuser. -config ADK_ROOTSH_MKSH - select ADK_PACKAGE_MKSH - bool "mksh (MirBSD Korn Shell)" - help - Use mksh (a Korn Shell variant) as standard login shell - for the superuser. - config ADK_ROOTSH_TCSH select ADK_PACKAGE_TCSH bool "tcsh (Tenex C Shell)" @@ -124,7 +117,7 @@ prompt "System /bin/sh (POSIX script shell)" default ADK_BINSH_MKSH config ADK_BINSH_MKSH - select ADK_PACKAGE_MKSH + select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY bool "mksh (MirBSD Korn Shell)" help Use mksh (a Korn Shell variant) as system shell, which is diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog index 08e884a01..4a727e7d6 100644 --- a/target/linux/config/Config.in.watchdog +++ b/target/linux/config/Config.in.watchdog @@ -73,7 +73,7 @@ config ADK_KERNEL_RC32434_WDT Routerboard 532's SoC, the IDT RC32434. config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG - prompt "kmod-softdog...................... Software watchdog" + prompt "kmod-soft-watchdog...................... Software watchdog" tristate default n select ADK_KERNEL_WATCHDOG |