Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

We need to revert the temporary hack in 71ebc01, hence the merge.

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index af8e9821adc5..613e62831c55 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -13,14 +13,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
@@ -124,16 +121,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.