Commit-ID: 5227b636eca4226287e43fc1de1e09a694bcaa34 Gitweb: http://git.kernel.org/tip/5227b636eca4226287e43fc1de1e09a694bcaa34 Author: Anna-Maria Gleixner <anna-maria@xxxxxxxxx> AuthorDate: Fri, 18 May 2012 16:45:46 +0000 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Mon, 21 May 2012 11:01:42 +0200 cris: Use generic time config Signed-off-by: Anna-Maria Gleixner <anna-maria@xxxxxxxxx> Cc: Jesper Nilsson <jesper.nilsson@xxxxxxxx> Link: http://lkml.kernel.org/r/20120518163105.286556794@xxxxxxxxx Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> --- arch/cris/Kconfig | 7 +------ 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 -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html