diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:34:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:34:27 +0100 |
| commit | a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf (patch) | |
| tree | 95a0df31b0c9b1e0357b8dd378e2eab637970df4 /arch/sh/include/cpu-sh2/cpu/cache.h | |
| parent | 2b3942e4bb20ef8ef26515bd958c2df83d9a6210 (diff) | |
| parent | 96b3d28bf4b00f62fc8386ff5d487d1830793a3d (diff) | |
| download | linux-a02ed5e3e05ec5e8af21e645cccc77f3a6480aaf.tar.bz2 | |
Merge branch 'sched/urgent' into sched/core
Pick up fixes before queueing up new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh/include/cpu-sh2/cpu/cache.h')
| -rw-r--r-- | arch/sh/include/cpu-sh2/cpu/cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/cpu-sh2/cpu/cache.h b/arch/sh/include/cpu-sh2/cpu/cache.h index 673515bc4135..aa1b2b9088a7 100644 --- a/arch/sh/include/cpu-sh2/cpu/cache.h +++ b/arch/sh/include/cpu-sh2/cpu/cache.h @@ -18,7 +18,7 @@ #define SH_CACHE_ASSOC 8 #if defined(CONFIG_CPU_SUBTYPE_SH7619) -#define CCR 0xffffffec +#define SH_CCR 0xffffffec #define CCR_CACHE_CE 0x01 /* Cache enable */ #define CCR_CACHE_WT 0x02 /* CCR[bit1=1,bit2=1] */ |