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, 3 insertions, 9 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 1ea3fd954756..2d493a3bdfe1 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -32,12 +32,15 @@ config SPARC
         select HAVE_NMI_WATCHDOG if SPARC64
         select HAVE_BPF_JIT
         select GENERIC_SMP_IDLE_THREAD
+        select GENERIC_CMOS_UPDATE
+        select GENERIC_CLOCKEVENTS
 
 config SPARC32
         def_bool !64BIT
         select GENERIC_ATOMIC64
         select CLZ_TAB
         select ARCH_THREAD_INFO_ALLOCATOR
+        select ARCH_USES_GETTIMEOFFSET
 
 config SPARC64
         def_bool 64BIT
@@ -77,13 +80,6 @@ config BITS
         default 32 if SPARC32
         default 64 if SPARC64
 
-config GENERIC_CMOS_UPDATE
-        bool
-        default y
-
-config GENERIC_CLOCKEVENTS
-        def_bool y
-
 config IOMMU_HELPER
         bool
         default y if SPARC64
@@ -274,8 +270,6 @@ config HOTPLUG_CPU
           can be controlled through /sys/devices/system/cpu/cpu#.
           Say N if you want to disable CPU hotplug.
 
-source "kernel/time/Kconfig"
-
 if SPARC64
 source "drivers/cpufreq/Kconfig"