Merge branch 'master' into gfs2

1 files changed, 5 insertions, 3 deletions

diff --git a/include/asm-sh/cpu-sh3/timer.h b/include/asm-sh/cpu-sh3/timer.h
index 3d8e95e8d10c..b2394cf76f49 100644
--- a/include/asm-sh/cpu-sh3/timer.h
+++ b/include/asm-sh/cpu-sh3/timer.h
@@ -20,9 +20,14 @@
  *      SH7710
  *      SH7720
  *      SH7300
+ *      SH7710
  * ---------------------------------------------------------------------------
  */
 
+#if !defined(CONFIG_CPU_SUBTYPE_SH7727)
+#define TMU_TOCR        0xfffffe90      /* Byte access */
+#endif
+
 #if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7710)
 #define TMU_TSTR        0xa412fe92      /* Byte access */
 
@@ -39,9 +44,6 @@
 #define TMU2_TCR        0xa412feb4      /* Word access */
 
 #else
-#if !defined(CONFIG_CPU_SUBTYPE_SH7727)
-#define TMU_TOCR        0xfffffe90      /* Byte access */
-#endif
 #define TMU_TSTR        0xfffffe92      /* Byte access */
 
 #define TMU0_TCOR       0xfffffe94      /* Long access */