---

yaml --- r: 77809 b: refs/heads/master c: 3ee7702 h: refs/heads/master i: 77807: 51ec188 v: v3
git-mirror · Jan 28, 2008 · 661c645 · 661c645
1 parent b5356aa
commit 661c645
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66d485b45a5493f6a2ca067c6f472e7b2ca342c2
+refs/heads/master: 3ee7702903c346fc814bd7540ba37eebef75054d
diff --git a/trunk/include/asm-sh/cpu-sh2/cache.h b/trunk/include/asm-sh/cpu-sh2/cache.h
@@ -18,8 +18,7 @@
 #define SH_CACHE_ASSOC		8
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7619)
-#define CCR1		0xffffffec
-#define CCR		CCR1
+#define CCR		0xffffffec
 
 #define CCR_CACHE_CE	0x01	/* Cache enable */
 #define CCR_CACHE_WT	0x06    /* CCR[bit1=1,bit2=1] */

diff --git a/trunk/include/asm-sh/cpu-sh2a/cache.h b/trunk/include/asm-sh/cpu-sh2a/cache.h
@@ -17,12 +17,9 @@
 #define SH_CACHE_COMBINED	4
 #define SH_CACHE_ASSOC		8
 
-#define CCR1		0xfffc1000
+#define CCR		0xfffc1000 /* CCR1 */
 #define CCR2		0xfffc1004
 
-/* CCR1 behaves more like the traditional CCR */
-#define CCR		CCR1
-
 /*
  * Most of the SH-2A CCR1 definitions resemble the SH-4 ones. All others not
  * listed here are reserved.
@@ -41,4 +38,3 @@
 #define CCR_CACHE_INVALIDATE	(CCR_CACHE_OCI | CCR_CACHE_ICI)
 
 #endif /* __ASM_CPU_SH2A_CACHE_H */
-