diff options
| author | Anna-Maria Gleixner <anna-maria@glx-um.de> | 2012-05-18 16:45:48 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-21 11:01:42 +0200 |
| commit | 21b19710a2fbbec3d81e7cb4d74a8ea4f0acfeea (patch) | |
| tree | 0bdc1fbc779f2906c54f83c4c5b84c0759983d97 /arch/ia64 | |
| parent | 24a6f35e192ed54205024742eb8a4a2f99c1da9d (diff) | |
| download | blackbird-op-linux-21b19710a2fbbec3d81e7cb4d74a8ea4f0acfeea.tar.gz blackbird-op-linux-21b19710a2fbbec3d81e7cb4d74a8ea4f0acfeea.zip | |
ia64: Use generic time config
Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de>
Cc: Tony Luck <tony.luck@intel.com>
Link: http://lkml.kernel.org/r/20120518163105.547603093@glx-um.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/Kconfig | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index bd7266903bf8..9f9d57bf8a2f 100644 --- a/arch/ia64/Kconfig +++ b/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 |
