From 5f96b57e399a508463483eb543926e5457926811 Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:48 +0000 Subject: [PATCH] --- yaml --- r: 307600 b: refs/heads/master c: 21b19710a2fbbec3d81e7cb4d74a8ea4f0acfeea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/Kconfig | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7ff3f045c11c..39ba438408d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24a6f35e192ed54205024742eb8a4a2f99c1da9d +refs/heads/master: 21b19710a2fbbec3d81e7cb4d74a8ea4f0acfeea diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig index bd7266903bf8..9f9d57bf8a2f 100644 --- a/trunk/arch/ia64/Kconfig +++ b/trunk/arch/ia64/Kconfig @@ -33,6 +33,8 @@ config IA64 select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_IOMAP + select ARCH_CLOCKSOURCE_DATA + select GENERIC_TIME_VSYSCALL default y help The Itanium Processor Family is Intel's 64-bit successor to @@ -88,10 +90,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config GENERIC_TIME_VSYSCALL - bool - default y - config HAVE_SETUP_PER_CPU_AREA def_bool y @@ -106,9 +104,6 @@ config EFI bool default y -config ARCH_CLOCKSOURCE_DATA - def_bool y - config SCHED_OMIT_FRAME_POINTER bool default y