summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/include
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-08-29 16:10:24 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-08-29 16:10:24 +0900
commit8a1c049aa9d31710dac5a794b47be5a081a886e4 (patch)
treee4512cf806af87ba69291ba10b72fddf7b97bd77 /arch/arm/mach-shmobile/include
parentfe43756143c4efa6f8fdef07aa3ca4dc0be24ada (diff)
parentafe48049ab1d0ca83afe45f9d5116bf4507741eb (diff)
downloadblackbird-op-linux-8a1c049aa9d31710dac5a794b47be5a081a886e4.tar.gz
blackbird-op-linux-8a1c049aa9d31710dac5a794b47be5a081a886e4.zip
Merge branch 'rmobile/dma' into rmobile-fixes-for-linus
Diffstat (limited to 'arch/arm/mach-shmobile/include')
-rw-r--r--arch/arm/mach-shmobile/include/mach/sh7372.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index ce595cee86cd..24e63a85e669 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -459,6 +459,10 @@ enum {
SHDMA_SLAVE_SDHI2_TX,
SHDMA_SLAVE_MMCIF_RX,
SHDMA_SLAVE_MMCIF_TX,
+ SHDMA_SLAVE_USB0_TX,
+ SHDMA_SLAVE_USB0_RX,
+ SHDMA_SLAVE_USB1_TX,
+ SHDMA_SLAVE_USB1_RX,
};
extern struct clk sh7372_extal1_clk;
OpenPOWER on IntegriCloud