Merge tag 'v3.9' into efi-for-tip2

[karo-tx-linux.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 33f3fdc0b214e93350b95d8ec8fcc935df2b56d9..da18c8e0521739829cfec289cd84f963adcc4a49 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -26,7 +26,7 @@ config IA64
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_VIRT_CPU_ACCOUNTING
-       select HAVE_VIRT_TO_BUS
+       select VIRT_TO_BUS
        select ARCH_DISCARD_MEMBLOCK
        select GENERIC_IRQ_PROBE
        select GENERIC_PENDING_IRQ if SMP
@@ -110,6 +110,7 @@ config DMI
 
 config EFI
        bool
+       select UCS2_STRING
        default y
 
 config SCHED_OMIT_FRAME_POINTER