diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-13 09:15:58 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-13 15:21:35 +0800 |
| commit | 438628396ca8a44f6b710a73612939bc54633d7c (patch) | |
| tree | bf318740f48ff4699cd0154e900507597dae835e /scripts | |
| parent | 5afe132e300375c685e60d80d6e5e6a822d216d6 (diff) | |
| parent | 0d590a1ecd1ad44b2dae2bcdc5a6cb24a7080489 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Remove cpuinfo_arm64/cpuinfo_store_cpu() that comes from commit
42b34c73ae40(used for stable kernel only), since we have
newer commit 5aa9ef6f286.
Conflicts:
arch/arm64/include/asm/cputype.h
arch/arm64/kernel/setup.c
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index db1512ae30cc..f53542b55de6 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -545,7 +545,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, { int i, j; struct menu *submenu[8], *menu, *location = NULL; - struct jump_key *jump; + struct jump_key *jump = NULL; str_printf(r, _("Prompt: %s\n"), _(prop->text)); menu = prop->menu->parent; @@ -583,7 +583,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, str_printf(r, _(" Location:\n")); for (j = 4; --i >= 0; j += 2) { menu = submenu[i]; - if (head && location && menu == location) + if (jump && menu == location) jump->offset = strlen(r->s); str_printf(r, "%*c-> %s", j, ' ', _(menu_get_prompt(menu))); |