diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
| commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
| tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /include/asm-sh/cpu-sh3/timer.h | |
| parent | 8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff) | |
| parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sh/cpu-sh3/timer.h')
| -rw-r--r-- | include/asm-sh/cpu-sh3/timer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-sh/cpu-sh3/timer.h b/include/asm-sh/cpu-sh3/timer.h index 4928b08f9d19..b6c2020a2ad3 100644 --- a/include/asm-sh/cpu-sh3/timer.h +++ b/include/asm-sh/cpu-sh3/timer.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * SH7729R | 19 | * SH7729R |
| 20 | * SH7710 | 20 | * SH7710 |
| 21 | * SH7720 | 21 | * SH7720 |
| 22 | * SH7300 | ||
| 23 | * SH7710 | 22 | * SH7710 |
| 24 | * --------------------------------------------------------------------------- | 23 | * --------------------------------------------------------------------------- |
| 25 | */ | 24 | */ |
| @@ -28,7 +27,7 @@ | |||
| 28 | #define TMU_TOCR 0xfffffe90 /* Byte access */ | 27 | #define TMU_TOCR 0xfffffe90 /* Byte access */ |
| 29 | #endif | 28 | #endif |
| 30 | 29 | ||
| 31 | #if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7710) | 30 | #if defined(CONFIG_CPU_SUBTYPE_SH7710) |
| 32 | #define TMU_012_TSTR 0xa412fe92 /* Byte access */ | 31 | #define TMU_012_TSTR 0xa412fe92 /* Byte access */ |
| 33 | 32 | ||
| 34 | #define TMU0_TCOR 0xa412fe94 /* Long access */ | 33 | #define TMU0_TCOR 0xa412fe94 /* Long access */ |