projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
arch
/
sh
/
include
/
asm
/
cache.h
diff --git
a/arch/sh/include/asm/cache.h
b/arch/sh/include/asm/cache.h
index
b21dc44
..
0698a37
100644
(file)
--- a/
arch/sh/include/asm/cache.h
+++ b/
arch/sh/include/asm/cache.h
@@
-1,7
+1,7
@@
#ifndef __ASM_SH_CACHE_H
#define __ASM_SH_CACHE_H
#ifndef __ASM_SH_CACHE_H
#define __ASM_SH_CACHE_H
-#if defined(CONFIG_SH4)
|| defined(CONFIG_SH4A)
+#if defined(CONFIG_SH4)
int cache_control(unsigned int cmd);
int cache_control(unsigned int cmd);
@@
-18,7
+18,7
@@
struct __large_struct { unsigned long buf[100]; };
*/
#define ARCH_DMA_MINALIGN 32
*/
#define ARCH_DMA_MINALIGN 32
-#endif /* CONFIG_SH4
|| CONFIG_SH4A
*/
+#endif /* CONFIG_SH4 */
/*
* Use the L1 data cache line size value for the minimum DMA buffer alignment
/*
* Use the L1 data cache line size value for the minimum DMA buffer alignment