Merge branches 'fixes' and 'fixes2' into devel-late

[pandora-kernel.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 1ea3fd9..83bd051 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -32,12 +32,16 @@ config SPARC
        select HAVE_NMI_WATCHDOG if SPARC64
        select HAVE_BPF_JIT
        select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_CMOS_UPDATE
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_STRNCPY_FROM_USER
+       select GENERIC_STRNLEN_USER
 
 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 +81,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 +271,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"