Merge branch 'akpm' (Andrew's patch-bomb)

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

diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 297bd38..49765b5 100644 (file)
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -18,6 +18,9 @@ config OPENRISC
        select GENERIC_IOMAP
        select GENERIC_CPU_DEVICES
        select GENERIC_ATOMIC64
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_STRNCPY_FROM_USER
+       select GENERIC_STRNLEN_USER
 
 config MMU
        def_bool y
@@ -47,9 +50,6 @@ config NO_IOPORT
 config GENERIC_GPIO
        def_bool y
 
-config GENERIC_CLOCKEVENTS
-       def_bool y
-
 config TRACE_IRQFLAGS_SUPPORT
         def_bool y
 
@@ -109,7 +109,6 @@ config OPENRISC_HAVE_INST_DIV
 endmenu
 
 
-source "kernel/time/Kconfig"
 source kernel/Kconfig.hz
 source kernel/Kconfig.preempt
 source "mm/Kconfig"