diff options
| author | Geert Uytterhoeven <[email protected]> | 2014-03-03 23:38:33 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-03-04 15:55:49 +0000 |
| commit | a5f6ea29f9a918403629f8369ae55fac6b09cb53 (patch) | |
| tree | a3a9cbaa19345e20aa79d66f975aa681db9d201d /arch/sh/mm/cache-debugfs.c | |
| parent | ocfs2: fix quota file corruption (diff) | |
| download | kernel-a5f6ea29f9a918403629f8369ae55fac6b09cb53.tar.gz kernel-a5f6ea29f9a918403629f8369ae55fac6b09cb53.zip | |
sh: prefix sh-specific "CCR" and "CCR2" by "SH_"
Commit bcf24e1daa94 ("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 <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'arch/sh/mm/cache-debugfs.c')
| -rw-r--r-- | arch/sh/mm/cache-debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/cache-debugfs.c b/arch/sh/mm/cache-debugfs.c index 115725198038..777e50f33c00 100644 --- a/arch/sh/mm/cache-debugfs.c +++ b/arch/sh/mm/cache-debugfs.c @@ -36,7 +36,7 @@ static int cache_seq_show(struct seq_file *file, void *iter) */ jump_to_uncached(); - ccr = __raw_readl(CCR); + ccr = __raw_readl(SH_CCR); if ((ccr & CCR_CACHE_ENABLE) == 0) { back_to_cached(); |