From 07c7307d11af450e8b6aaf9e57d8ba240cf1a7ef Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 27 Apr 2009 14:40:47 +0900
Subject: [PATCH] --- yaml --- r: 146683 b: refs/heads/master c:
 5be7c0a4d3dfe25091f2e4e524103e81d9e7e180 h: refs/heads/master i:   146681:
 38b58bd836515d68cccbc1eb429707224b5d607b   146679:
 b74d01bf4ddd1d262dcbb80c89d12de1344391fc v: v3

---
 [refs]                | 2 +-
 trunk/arch/sh/Kconfig | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f80a3b73105d..db0d7c06114e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc4967b8c6a1540ebce9ac48e44b8d44e7fac971
+refs/heads/master: 5be7c0a4d3dfe25091f2e4e524103e81d9e7e180
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 4c68fdedfa10..164748945f95 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -476,10 +476,11 @@ config SH_TIMER_CMT
 	bool "CMT clockevents driver"
 	depends on SYS_SUPPORTS_CMT && !SH_CMT
 	select GENERIC_CLOCKEVENTS
+	select GENERIC_TIME
 
 config SH_MTU2
 	bool "MTU2 timer support"
-	depends on CPU_SH2A
+	depends on CPU_SH2A && !GENERIC_TIME
 	default y
 	help
 	  This enables the use of the MTU2 as the system timer.