Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / openrisc / Kconfig

diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 7589051..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"
@@ -142,7 +141,7 @@ config DEBUG_STACKOVERFLOW
        bool "Check for kernel stack overflow"
        default y
        help
-         Make extra checks for space avaliable on stack in some
+         Make extra checks for space available on stack in some
           critical functions. This will cause kernel to run a bit slower,
          but will catch most of kernel stack overruns and exit gracefuly.