aboutsummaryrefslogtreecommitdiff
path: root/include/asm-sh/cpu-sh3
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-02-14 15:09:27 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-02-25 18:49:44 +0900
commitcc645a020510cf68332a71394a32c1eacb92c6ed (patch)
tree32ea3d54ef2583adbf73cd452a4a24e48d06c5fb /include/asm-sh/cpu-sh3
parentbfa274e2436fc7ef72ef51c878083647f1cfd429 (diff)
sh: Rename SH-3 CCR3 reg to avoid synclink_cs clash.
drivers/char/pcmcia/synclink_cs.c:284:1: warning: "CCR3" redefined In file included from include/asm/cache.h:13, from include/asm/processor_32.h:15, from include/asm/processor.h:60, from include/linux/prefetch.h:14, from include/linux/list.h:8, from include/linux/module.h:9, from drivers/char/pcmcia/synclink_cs.c:38: include/asm/cpu/cache.h:38:1: warning: this is the location of the previous definition Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/asm-sh/cpu-sh3')
-rw-r--r--include/asm-sh/cpu-sh3/cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/cpu-sh3/cache.h b/include/asm-sh/cpu-sh3/cache.h
index 56bd838b7db..bee2d81c56b 100644
--- a/include/asm-sh/cpu-sh3/cache.h
+++ b/include/asm-sh/cpu-sh3/cache.h
@@ -35,7 +35,7 @@
defined(CONFIG_CPU_SUBTYPE_SH7710) || \
defined(CONFIG_CPU_SUBTYPE_SH7720) || \
defined(CONFIG_CPU_SUBTYPE_SH7721)
-#define CCR3 0xa40000b4
+#define CCR3_REG 0xa40000b4
#define CCR_CACHE_16KB 0x00010000
#define CCR_CACHE_32KB 0x00020000
#endif