From: Anna-Maria Gleixner <anna-maria@glx-um.de>
Date: Fri, 18 May 2012 16:45:50 +0000 (+0000)
Subject: mips: Use generic time config
X-Git-Tag: upstream/snapshot3+hdmi~7392^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cde1794b069f44ca02f3f4f50a903e9361132244;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

mips: Use generic time config

Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Link: http://lkml.kernel.org/r/20120518163106.073559820@glx-um.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ce30e2f..c9c330b 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -29,6 +29,8 @@ config MIPS
 	select HAVE_MEMBLOCK
 	select HAVE_MEMBLOCK_NODE_MAP
 	select ARCH_DISCARD_MEMBLOCK
+	select GENERIC_CLOCKEVENTS
+	select GENERIC_CMOS_UPDATE
 
 menu "Machine selection"
 
@@ -856,14 +858,6 @@ config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
 
-config GENERIC_CLOCKEVENTS
-	bool
-	default y
-
-config GENERIC_CMOS_UPDATE
-	bool
-	default y
-
 config SCHED_OMIT_FRAME_POINTER
 	bool
 	default y
@@ -2050,9 +2044,6 @@ config CPU_HAS_SYNC
 	depends on !CPU_R3000
 	default y
 
-config GENERIC_CLOCKEVENTS_BROADCAST
-	bool
-
 #
 # CPU non-features
 #