diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 03:42:06 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 03:42:06 -0400 |
| commit | b58c580d996655658975aa8042b43b7d579f3986 (patch) | |
| tree | 60ddd845ad49ad99702a7d7d7721ce3aebb37394 /arch/arm/mach-shmobile/include | |
| parent | 09dafe9e4e266c7868454a532c9ca762aa5c40a5 (diff) | |
| parent | a408baea3cdd2a7b5ad3d70080dff454b8883f62 (diff) | |
Merge branch 'rmobile-fixes-for-linus' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-shmobile/include')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/sh7372.h | 4 |
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 { | |||
| 459 | SHDMA_SLAVE_SDHI2_TX, | 459 | SHDMA_SLAVE_SDHI2_TX, |
| 460 | SHDMA_SLAVE_MMCIF_RX, | 460 | SHDMA_SLAVE_MMCIF_RX, |
| 461 | SHDMA_SLAVE_MMCIF_TX, | 461 | SHDMA_SLAVE_MMCIF_TX, |
| 462 | SHDMA_SLAVE_USB0_TX, | ||
| 463 | SHDMA_SLAVE_USB0_RX, | ||
| 464 | SHDMA_SLAVE_USB1_TX, | ||
| 465 | SHDMA_SLAVE_USB1_RX, | ||
| 462 | }; | 466 | }; |
| 463 | 467 | ||
| 464 | extern struct clk sh7372_extal1_clk; | 468 | extern struct clk sh7372_extal1_clk; |