Commit-ID: da74caa6cead3f6c55dabcaa7b397b2fddd655e3 Gitweb: http://git.kernel.org/tip/da74caa6cead3f6c55dabcaa7b397b2fddd655e3 Author: Matt Fleming <matt.fleming@xxxxxxxxx> AuthorDate: Mon, 29 Apr 2013 14:30:28 +0100 Committer: Matt Fleming <matt.fleming@xxxxxxxxx> CommitDate: Mon, 29 Apr 2013 14:46:15 +0100 ia64, efi: select UCS2_STRING when building EFI support The ucs2 string library functions are required by the core EFI code. Select UCS2_STRING from the EFI symbol entry in arch/ia64/Kconfig, just like we do for x86. This Kconfig bug was caused by a mis-merge in commit e29c2de5f591 ("Merge tag 'v3.9-rc8' into efi-for-tip"). Cc: Ingo Molnar <mingo@xxxxxxxxxx> CC: H. Peter Anvin <hpa@xxxxxxxxx> Cc: Tony Luck <tony.luck@xxxxxxxxx> Cc: Matthew Garrett <matthew.garrett@xxxxxxxxxx> Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx> --- arch/ia64/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 9a02f71..da18c8e 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -110,6 +110,7 @@ config DMI config EFI bool + select UCS2_STRING default y config SCHED_OMIT_FRAME_POINTER -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html