Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid

[linux-2.6-omap-h63xx.git] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 1a6348b565fb4af6480e16afc988fe9c8cbef34c..590a41b864b9227cfda9bf4dbe24daceeede71b7 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -19,6 +19,14 @@ config SPARC64
          SPARC64 ports; its web page is available at
          <http://www.ultralinux.org/>.
 
+config GENERIC_TIME
+       bool
+       default y
+
+config GENERIC_CLOCKEVENTS
+       bool
+       default y
+
 config 64BIT
        def_bool y
 
@@ -34,10 +42,6 @@ config LOCKDEP_SUPPORT
        bool
        default y
 
-config TIME_INTERPOLATION
-       bool
-       default y
-
 config ARCH_MAY_HAVE_PC_FDC
        bool
        default y
@@ -113,6 +117,8 @@ config GENERIC_HARDIRQS
 
 menu "General machine setup"
 
+source "kernel/time/Kconfig"
+
 config SMP
        bool "Symmetric multi-processing support"
        ---help---
@@ -214,6 +220,7 @@ config ARCH_SPARSEMEM_ENABLE
 
 config ARCH_SPARSEMEM_DEFAULT
        def_bool y
+       select SPARSEMEM_STATIC
 
 config LARGE_ALLOCS
        def_bool y