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

Pull timer updates from Thomas Gleixner.

Various trivial conflict fixups in arch Kconfig due to addition of
unrelated entries nearby.  And one slightly more subtle one for sparc32
(new user of GENERIC_CLOCKEVENTS), fixed up as per Thomas.

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)
  timekeeping: Fix a few minor newline issues.
  time: remove obsolete declaration
  ntp: Fix a stale comment and a few stray newlines.
  ntp: Correct TAI offset during leap second
  timers: Fixup the Kconfig consolidation fallout
  x86: Use generic time config
  unicore32: Use generic time config
  um: Use generic time config
  tile: Use generic time config
  sparc: Use: generic time config
  sh: Use generic time config
  score: Use generic time config
  s390: Use generic time config
  openrisc: Use generic time config
  powerpc: Use generic time config
  mn10300: Use generic time config
  mips: Use generic time config
  microblaze: Use generic time config
  m68k: Use generic time config
  m32r: Use generic time config
  ...

1 files changed, 2 insertions, 7 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index ba667b60f32d..8186ec5ea151 100644
--- 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