git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'omap-boards' into omap-for-linus
[pandora-kernel.git]
/
arch
/
sh
/
include
/
cpu-sh4
/
cpu
/
dma-register.h
diff --git
a/arch/sh/include/cpu-sh4/cpu/dma-register.h
b/arch/sh/include/cpu-sh4/cpu/dma-register.h
index
55f9fec
..
de23595
100644
(file)
--- a/
arch/sh/include/cpu-sh4/cpu/dma-register.h
+++ b/
arch/sh/include/cpu-sh4/cpu/dma-register.h
@@
-76,7
+76,7
@@
enum {
}
#define TS_INDEX2VAL(i) ((((i) & 3) << CHCR_TS_LOW_SHIFT) | \
- (((
(i) >> 2) & 3
) << CHCR_TS_HIGH_SHIFT))
+ (((
i) & 0xc
) << CHCR_TS_HIGH_SHIFT))
#else /* CONFIG_CPU_SH4A */