Merge branch 'devel' into next

[sfrench/cifs-2.6.git] / arch / sh / kernel / timers / timer-mtu2.c

diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c
index fe453c01f9c9d533ab4d3fd5e4e1356c4bba6aa8..c3d237e1d566e4c91704284b07a8ced28ce2ba1d 100644 (file)
--- a/arch/sh/kernel/timers/timer-mtu2.c
+++ b/arch/sh/kernel/timers/timer-mtu2.c
@@ -34,7 +34,12 @@
 #define MTU2_TIER_1    0xfffe4384
 #define MTU2_TSR_1     0xfffe4385
 #define MTU2_TCNT_1    0xfffe4386      /* 16-bit counter */
+
+#if defined(CONFIG_CPU_SUBTYPE_SH7201)
+#define MTU2_TGRA_1    0xfffe4388
+#else
 #define MTU2_TGRA_1    0xfffe438a
+#endif
 
 #define STBCR3         0xfffe0408