]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
sh: CCR1->CCR renaming for SH-2 parts.
authorPaul Mundt <lethal@linux-sh.org>
Wed, 28 Nov 2007 06:56:27 +0000 (15:56 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 28 Jan 2008 04:18:58 +0000 (13:18 +0900)
commit3ee7702903c346fc814bd7540ba37eebef75054d
treea8862c569085da7e019d7830ba2b54e0b5aa73a7
parent66d485b45a5493f6a2ca067c6f472e7b2ca342c2
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 <akpm@linux-foundation.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
include/asm-sh/cpu-sh2/cache.h
include/asm-sh/cpu-sh2a/cache.h