diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-10 08:57:14 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-10 08:57:14 +0100 |
commit | 099b4d3b473db012a55ce6bec9ef594d0508e782 (patch) | |
tree | a55980b995612c188d02bd6f47b93f1e17733572 /arch/sh/include/cpu-sh4/cpu/sh7722.h | |
parent | 09e1e9c4a4009a75c1dd716b6f0797fae3ab4dfd (diff) | |
parent | 7e9f1945213cdd7cd11f29346ded07a81854b5af (diff) |
Merge branch 'davinci-next' of git://gitorious.org/linux-davinci/linux-davinci into fixes
Diffstat (limited to 'arch/sh/include/cpu-sh4/cpu/sh7722.h')
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/sh7722.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/include/cpu-sh4/cpu/sh7722.h b/arch/sh/include/cpu-sh4/cpu/sh7722.h index 7a5b8a331b4a..bd0622788d64 100644 --- a/arch/sh/include/cpu-sh4/cpu/sh7722.h +++ b/arch/sh/include/cpu-sh4/cpu/sh7722.h @@ -236,6 +236,7 @@ enum { }; enum { + SHDMA_SLAVE_INVALID, SHDMA_SLAVE_SCIF0_TX, SHDMA_SLAVE_SCIF0_RX, SHDMA_SLAVE_SCIF1_TX, |