From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 28 Nov 2007 06:56:27 +0000 (+0900)
Subject: sh: CCR1->CCR renaming for SH-2 parts.
X-Git-Tag: v2.6.25-rc1~1169^2~53
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ee7702903c346fc814bd7540ba37eebef75054d;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed