diff options
| author | Anna-Maria Gleixner <anna-maria@glx-um.de> | 2012-05-18 12:45:48 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-21 05:01:42 -0400 |
| commit | 21b19710a2fbbec3d81e7cb4d74a8ea4f0acfeea (patch) | |
| tree | 0bdc1fbc779f2906c54f83c4c5b84c0759983d97 | |
| parent | 24a6f35e192ed54205024742eb8a4a2f99c1da9d (diff) | |
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>
| -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 | |||
| 33 | select ARCH_WANT_OPTIONAL_GPIOLIB | 33 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 34 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 34 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
| 35 | select GENERIC_IOMAP | 35 | select GENERIC_IOMAP |
| 36 | select ARCH_CLOCKSOURCE_DATA | ||
| 37 | select GENERIC_TIME_VSYSCALL | ||
| 36 | default y | 38 | default y |
| 37 | help | 39 | help |
| 38 | The Itanium Processor Family is Intel's 64-bit successor to | 40 | The Itanium Processor Family is Intel's 64-bit successor to |
| @@ -88,10 +90,6 @@ config GENERIC_CALIBRATE_DELAY | |||
| 88 | bool | 90 | bool |
| 89 | default y | 91 | default y |
| 90 | 92 | ||
| 91 | config GENERIC_TIME_VSYSCALL | ||
| 92 | bool | ||
| 93 | default y | ||
| 94 | |||
| 95 | config HAVE_SETUP_PER_CPU_AREA | 93 | config HAVE_SETUP_PER_CPU_AREA |
| 96 | def_bool y | 94 | def_bool y |
| 97 | 95 | ||
| @@ -106,9 +104,6 @@ config EFI | |||
| 106 | bool | 104 | bool |
| 107 | default y | 105 | default y |
| 108 | 106 | ||
| 109 | config ARCH_CLOCKSOURCE_DATA | ||
| 110 | def_bool y | ||
| 111 | |||
| 112 | config SCHED_OMIT_FRAME_POINTER | 107 | config SCHED_OMIT_FRAME_POINTER |
| 113 | bool | 108 | bool |
| 114 | default y | 109 | default y |
