---

yaml --- r: 146683 b: refs/heads/master c: 5be7c0a h: refs/heads/master i: 146681: 38b58bd 146679: b74d01b v: v3
git-mirror · Apr 27, 2009 · 07c7307 · 07c7307
1 parent 269d420
commit 07c7307
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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.