Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index ba667b6..8186ec5 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -37,6 +37,8 @@ config IA64
        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
@@ -92,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
 
@@ -110,9 +108,6 @@ config EFI
        bool
        default y
 
-config ARCH_CLOCKSOURCE_DATA
-       def_bool y
-
 config SCHED_OMIT_FRAME_POINTER
        bool
        default y