mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-19 02:04:19 +08:00
a5f6ea29f9
Commit bcf24e1daa ("mmc: omap_hsmmc: use the generic config for
omap2plus devices"), enabled the build for other platforms for compile
testing.
sh-allmodconfig now fails with:
include/linux/omap-dma.h:171:8: error: expected identifier before numeric constant
make[4]: *** [drivers/mmc/host/omap_hsmmc.o] Error 1
This happens because SuperH #defines "CCR", which is one of the enum
values in include/linux/omap-dma.h. There's a similar issue with "CCR2"
on sh2a.
As "CCR" and "CCR2" are too generic names for global #defines, prefix
them with "SH_" to fix this.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
44 lines
1.2 KiB
C
44 lines
1.2 KiB
C
/*
|
|
* include/asm-sh/cpu-sh2a/cache.h
|
|
*
|
|
* Copyright (C) 2004 Paul Mundt
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
#ifndef __ASM_CPU_SH2A_CACHE_H
|
|
#define __ASM_CPU_SH2A_CACHE_H
|
|
|
|
#define L1_CACHE_SHIFT 4
|
|
|
|
#define SH_CACHE_VALID 1
|
|
#define SH_CACHE_UPDATED 2
|
|
#define SH_CACHE_COMBINED 4
|
|
#define SH_CACHE_ASSOC 8
|
|
|
|
#define SH_CCR 0xfffc1000 /* CCR1 */
|
|
#define SH_CCR2 0xfffc1004
|
|
|
|
/*
|
|
* Most of the SH-2A CCR1 definitions resemble the SH-4 ones. All others not
|
|
* listed here are reserved.
|
|
*/
|
|
#define CCR_CACHE_CB 0x0000 /* Hack */
|
|
#define CCR_CACHE_OCE 0x0001
|
|
#define CCR_CACHE_WT 0x0002
|
|
#define CCR_CACHE_OCI 0x0008 /* OCF */
|
|
#define CCR_CACHE_ICE 0x0100
|
|
#define CCR_CACHE_ICI 0x0800 /* ICF */
|
|
|
|
#define CACHE_IC_ADDRESS_ARRAY 0xf0000000
|
|
#define CACHE_OC_ADDRESS_ARRAY 0xf0800000
|
|
|
|
#define CCR_CACHE_ENABLE (CCR_CACHE_OCE | CCR_CACHE_ICE)
|
|
#define CCR_CACHE_INVALIDATE (CCR_CACHE_OCI | CCR_CACHE_ICI)
|
|
#define CCR_ICACHE_INVALIDATE CCR_CACHE_ICI
|
|
#define CCR_OCACHE_INVALIDATE CCR_CACHE_OCI
|
|
#define CACHE_PHYSADDR_MASK 0x1ffffc00
|
|
|
|
#endif /* __ASM_CPU_SH2A_CACHE_H */
|