summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorAnna-Maria Gleixner <anna-maria@glx-um.de>2012-05-18 16:45:46 +0000
committerThomas Gleixner <tglx@linutronix.de>2012-05-21 11:01:42 +0200
commit5227b636eca4226287e43fc1de1e09a694bcaa34 (patch)
tree8e13ea680837b37423d2b7a2ea4312c8b1378d66 /arch/cris
parent6220443db41899606a8621215e0f6e99477f7152 (diff)
downloadop-kernel-dev-5227b636eca4226287e43fc1de1e09a694bcaa34.zip
op-kernel-dev-5227b636eca4226287e43fc1de1e09a694bcaa34.tar.gz
cris: Use generic time config
Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Link: http://lkml.kernel.org/r/20120518163105.286556794@glx-um.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/Kconfig7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index b3abfb0..4a63e7e 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -13,12 +13,6 @@ config RWSEM_GENERIC_SPINLOCK
config RWSEM_XCHGADD_ALGORITHM
bool
-config GENERIC_CMOS_UPDATE
- def_bool y
-
-config ARCH_USES_GETTIMEOFFSET
- def_bool n
-
config ARCH_HAS_ILOG2_U32
bool
default n
@@ -49,6 +43,7 @@ config CRIS
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
select GENERIC_IOMAP
+ select GENERIC_CMOS_UPDATE
config HZ
int
OpenPOWER on IntegriCloud