Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[~andy/linux] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 11975475516a6e3caaf7fd8dd2ee674300f43b39..8186ec5ea15168a31a1a876b8a7b52ec7c8f4616 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -34,6 +34,11 @@ config IA64
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_IOMAP
        select GENERIC_SMP_IDLE_THREAD
+       select ARCH_INIT_TASK
+       select ARCH_TASK_STRUCT_ALLOCATOR
+       select ARCH_THREAD_INFO_ALLOCATOR
+       select ARCH_CLOCKSOURCE_DATA
+       select GENERIC_TIME_VSYSCALL
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
@@ -89,10 +94,6 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
-config GENERIC_TIME_VSYSCALL
-       bool
-       default y
-
 config HAVE_SETUP_PER_CPU_AREA
        def_bool y
 
@@ -107,9 +108,6 @@ config EFI
        bool
        default y
 
-config ARCH_CLOCKSOURCE_DATA
-       def_bool y
-
 config SCHED_OMIT_FRAME_POINTER
        bool
        default y