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 'u-boot-samsung/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
sh_tmu.h
diff --git
a/include/sh_tmu.h
b/include/sh_tmu.h
index
a55d141
..
96c589d
100644
(file)
--- a/
include/sh_tmu.h
+++ b/
include/sh_tmu.h
@@
-47,7
+47,7
@@
struct tmu_regs {
};
#endif /* CONFIG_SH3 */
-#if defined(CONFIG_SH4) || defined(CONFIG_SH4A)
+#if defined(CONFIG_SH4) || defined(CONFIG_SH4A)
|| defined(CONFIG_RMOBILE)
struct tmu_regs {
u32 reserved;
u8 tstr;