Merge branch 'for-linus' of git://www.jni.nu/cris

[sfrench/cifs-2.6.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 887ef855be2a59c0a61f513cfeaafc2df72cd802..aefe3b18a074a92a0b2a4260758f7d896e0f8362 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -24,7 +24,7 @@ config GENERIC_CMOS_UPDATE
        def_bool y
 
 config ARCH_USES_GETTIMEOFFSET
-       def_bool y
+       def_bool n
 
 config GENERIC_IOMAP
        bool
@@ -128,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.