diff --git a/[refs] b/[refs] index ca99694987fd..42f14a808eba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3530570fd43632b60b00e5ea17519d2bd69d1434 +refs/heads/master: d95fb13c960ae19e9fd4a95807eb68fa20caf537 diff --git a/trunk/include/asm-sh/cpu-sh3/timer.h b/trunk/include/asm-sh/cpu-sh3/timer.h index 3d8e95e8d10c..2082ad956f21 100644 --- a/trunk/include/asm-sh/cpu-sh3/timer.h +++ b/trunk/include/asm-sh/cpu-sh3/timer.h @@ -23,6 +23,10 @@ * --------------------------------------------------------------------------- */ +#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 +43,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 */