diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-25 02:45:43 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-25 02:45:43 -0500 |
commit | 1ad2096c4eba144522d87541c4024b8c84e95051 (patch) | |
tree | a149d469a4da72a7b6e6b777879b740046c4ebc9 /arch/arm/mach-shmobile/include/mach | |
parent | c4d73e7d75a54451d6e073c118ba2b8d87bd350d (diff) | |
parent | df73af86b6e737f357aae85e0b5e621516117780 (diff) |
Merge branch 'rmobile/mmcif' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach')
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/sh7372.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h index e4f9004e7103..5736efcca60c 100644 --- a/arch/arm/mach-shmobile/include/mach/sh7372.h +++ b/arch/arm/mach-shmobile/include/mach/sh7372.h | |||
@@ -455,6 +455,8 @@ enum { | |||
455 | SHDMA_SLAVE_SDHI1_TX, | 455 | SHDMA_SLAVE_SDHI1_TX, |
456 | SHDMA_SLAVE_SDHI2_RX, | 456 | SHDMA_SLAVE_SDHI2_RX, |
457 | SHDMA_SLAVE_SDHI2_TX, | 457 | SHDMA_SLAVE_SDHI2_TX, |
458 | SHDMA_SLAVE_MMCIF_RX, | ||
459 | SHDMA_SLAVE_MMCIF_TX, | ||
458 | }; | 460 | }; |
459 | 461 | ||
460 | extern struct clk sh7372_extal1_clk; | 462 | extern struct clk sh7372_extal1_clk; |