Merge branch 'linux-2.6' into for-2.6.22

1 files changed, 11 insertions, 4 deletions

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 1a6348b565fb..590a41b864b9 100644
--- 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