Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[firefly-linux-kernel-4.4.55.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index e25bf4440b513d215ae183736268178143289b1d..aefe3b18a074a92a0b2a4260758f7d896e0f8362 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -20,14 +20,11 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
-config GENERIC_TIME
-       def_bool y
-
 config GENERIC_CMOS_UPDATE
        def_bool y
 
 config ARCH_USES_GETTIMEOFFSET
-       def_bool y
+       def_bool n
 
 config GENERIC_IOMAP
        bool
@@ -131,16 +128,19 @@ choice
 
 config ETRAX100LX
        bool "ETRAX-100LX-v1"
+       select ARCH_USES_GETTIMEOFFSET
        help
          Support version 1 of the ETRAX 100LX.
 
 config ETRAX100LX_V2
        bool "ETRAX-100LX-v2"
+       select ARCH_USES_GETTIMEOFFSET
        help
          Support version 2 of the ETRAX 100LX.
 
 config SVINTO_SIM
        bool "ETRAX-100LX-for-xsim-simulator"
+       select ARCH_USES_GETTIMEOFFSET
        help
          Support the xsim ETRAX Simulator.