Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=75f016a7ce75220d898608791870ab7da549a430
Commit:     75f016a7ce75220d898608791870ab7da549a430
Parent:     880dec100761f4fbc5fa5d22e658a8718828f04e
Author:     Nobuhiro Iwamatsu <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 6 10:26:03 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Fri Jul 6 10:26:03 2007 +0900

    sh: Fix timer-tmu build for SH-3.
    
    With the TMU register definitions being renamed on SH-4, SH-3 ended up
    breaking. Update the TSTR define to match the SH-4 convention.
    
    Signed-off-by: Nobuhiro Iwamatsu <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 include/asm-sh/cpu-sh3/timer.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-sh/cpu-sh3/timer.h b/include/asm-sh/cpu-sh3/timer.h
index b2394cf..4928b08 100644
--- a/include/asm-sh/cpu-sh3/timer.h
+++ b/include/asm-sh/cpu-sh3/timer.h
@@ -29,7 +29,7 @@
 #endif
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7710)
-#define TMU_TSTR       0xa412fe92      /* Byte access */
+#define TMU_012_TSTR   0xa412fe92      /* Byte access */
 
 #define TMU0_TCOR      0xa412fe94      /* Long access */
 #define TMU0_TCNT      0xa412fe98      /* Long access */
@@ -44,7 +44,7 @@
 #define TMU2_TCR       0xa412feb4      /* Word access */
 
 #else
-#define TMU_TSTR       0xfffffe92      /* Byte access */
+#define TMU_012_TSTR   0xfffffe92      /* Byte access */
 
 #define TMU0_TCOR      0xfffffe94      /* Long access */
 #define TMU0_TCNT      0xfffffe98      /* Long access */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to