Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3ee7702903c346fc814bd7540ba37eebef75054d
Commit:     3ee7702903c346fc814bd7540ba37eebef75054d
Parent:     66d485b45a5493f6a2ca067c6f472e7b2ca342c2
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Wed Nov 28 15:56:27 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 13:18:58 2008 +0900

    sh: CCR1->CCR renaming for SH-2 parts.
    
    Avoid namespace collision with a CCR1 definition. The general
    SH code always expects CCR anyways, so there's no point in keeping
    the CCR1 naming around.
    
    Fixes up synclink collisions:
    
    drivers/char/pcmcia/synclink_cs.c:283:1: warning: "CCR1" 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:21:1: warning: this is the location of the previous 
definition
    
    Reported-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 include/asm-sh/cpu-sh2/cache.h  |    3 +--
 include/asm-sh/cpu-sh2a/cache.h |    6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/asm-sh/cpu-sh2/cache.h b/include/asm-sh/cpu-sh2/cache.h
index 66388ce..4e0b165 100644
--- a/include/asm-sh/cpu-sh2/cache.h
+++ b/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/include/asm-sh/cpu-sh2a/cache.h b/include/asm-sh/cpu-sh2a/cache.h
index d887741..afe228b 100644
--- a/include/asm-sh/cpu-sh2a/cache.h
+++ b/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 */
-
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to