Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 0a947bd..050cb37 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -27,15 +27,6 @@ config MMU
        bool
        default y
 
-config GENERIC_CMOS_UPDATE
-       def_bool y
-
-config GENERIC_TIME_VSYSCALL
-       def_bool y
-
-config GENERIC_CLOCKEVENTS
-       def_bool y
-
 config HAVE_SETUP_PER_CPU_AREA
        def_bool PPC64
 
@@ -141,6 +132,11 @@ config PPC
        select HAVE_ARCH_JUMP_LABEL
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_CMOS_UPDATE
+       select GENERIC_TIME_VSYSCALL
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_STRNCPY_FROM_USER
+       select GENERIC_STRNLEN_USER
 
 config EARLY_PRINTK
        bool
@@ -281,7 +277,6 @@ config HIGHMEM
        bool "High memory support"
        depends on PPC32
 
-source kernel/time/Kconfig
 source kernel/Kconfig.hz
 source kernel/Kconfig.preempt
 source "fs/Kconfig.binfmt"