diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-10-30 11:06:12 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-07 16:27:07 -0500 |
| commit | ad618992f7199fe93c3ecc3dd397ec0bef575933 (patch) | |
| tree | 91838fe82aadeb2f6d47964adce5a60d4159f5c6 /scripts/kconfig/lxdialog | |
| parent | ffe29ebc070104b529abcdc589eb87f3e5d85fa4 (diff) | |
| download | blackbird-obmc-uboot-ad618992f7199fe93c3ecc3dd397ec0bef575933.tar.gz blackbird-obmc-uboot-ad618992f7199fe93c3ecc3dd397ec0bef575933.zip | |
kconfig: sync kconfig files with Linux 3.18-rc1
This commit imports Kconfig updates from Linux 3.18-rc1.
'kvmconfig' and 'tinyconfig' help message have been commented out
since they are unavailable at least now; in the future perhaps
we can implement 'tinyconfig' to disable most of CONFIG_CMD_* to
create a very small U-Boot image.
[1] commit 3aaefce10351 by Josh Triplett
x86, platform, kconfig: move kvmconfig functionality to a helper
[2] commit 0da1d4a0b951 by Josh Triplett
x86: Add "make tinyconfig" to configure the tiniest possible kernel
[3] commit c40724d3f381 by Brian Norris
kconfig: lxdialog: fix spelling
[4] commit 7285996aa000 by Brian Norris
kconfig: nconfig: fix multi-byte UTF handling
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'scripts/kconfig/lxdialog')
| -rw-r--r-- | scripts/kconfig/lxdialog/dialog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h index b4343d3849..fcffd5b41f 100644 --- a/scripts/kconfig/lxdialog/dialog.h +++ b/scripts/kconfig/lxdialog/dialog.h @@ -170,7 +170,7 @@ char item_tag(void); /* item list manipulation for lxdialog use */ #define MAXITEMSTR 200 struct dialog_item { - char str[MAXITEMSTR]; /* promtp displayed */ + char str[MAXITEMSTR]; /* prompt displayed */ char tag; void *data; /* pointer to menu item - used by menubox+checklist */ int selected; /* Set to 1 by dialog_*() function if selected. */ |
