---

yaml --- r: 146793 b: refs/heads/master c: f19900b h: refs/heads/master i: 146791: 9e7cdd1 v: v3
git-mirror · May 12, 2009 · 12d39ff · 12d39ff
1 parent 50016db
commit 12d39ff
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 439 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b23a8826a60268ec52302729911dd7ac6b10776
+refs/heads/master: f19900b2e608b604777a74d6d711bbf744657756
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
@@ -473,16 +473,9 @@ source "arch/sh/boards/Kconfig"
 
 menu "Timer and clock configuration"
 
-config SH_TMU
-	bool "TMU timer support"
-	depends on CPU_SH3 || CPU_SH4
-	default y
-	help
-	  This enables the use of the TMU as the system timer.
-
 config SH_TIMER_TMU
 	bool "TMU timer driver"
-	depends on !SH_TMU && SYS_SUPPORTS_TMU
+	depends on SYS_SUPPORTS_TMU
 	default y
 	help
 	  This enables the build of the TMU timer driver.

diff --git a/trunk/arch/sh/include/asm/timer.h b/trunk/arch/sh/include/asm/timer.h
@@ -18,7 +18,6 @@ struct sys_timer {
 	struct sys_timer_ops	*ops;
 };
 
-extern struct sys_timer tmu_timer;
 extern struct sys_timer *sys_timer;
 
 /* arch/sh/kernel/timers/timer.c */

diff --git a/trunk/arch/sh/include/cpu-sh3/cpu/timer.h b/trunk/arch/sh/include/cpu-sh3/cpu/timer.h
diff --git a/trunk/arch/sh/include/cpu-sh4/cpu/timer.h b/trunk/arch/sh/include/cpu-sh4/cpu/timer.h
diff --git a/trunk/arch/sh/kernel/timers/Makefile b/trunk/arch/sh/kernel/timers/Makefile
@@ -3,5 +3,3 @@
 #
 
 obj-y	:= timer.o
-
-obj-$(CONFIG_SH_TMU)		+= timer-tmu.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,3 @@
		#

		obj-y := timer.o

		obj-$(CONFIG_SH_TMU) += timer-tmu.o