From 2399e92f0ce4ba47d017019be78a120b71f5f585 Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:46 +0000 Subject: [PATCH] --- yaml --- r: 307598 b: refs/heads/master c: 5227b636eca4226287e43fc1de1e09a694bcaa34 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/cris/Kconfig | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2aa431d9edf9..cfd9e9e08b44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6220443db41899606a8621215e0f6e99477f7152 +refs/heads/master: 5227b636eca4226287e43fc1de1e09a694bcaa34 diff --git a/trunk/arch/cris/Kconfig b/trunk/arch/cris/Kconfig index b3abfb08aa5c..4a63e7eca105 100644 --- a/trunk/arch/cris/Kconfig +++ b/trunk/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