diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-16 09:46:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-16 09:46:08 -0700 |
| commit | f49cc57cc9d1686bdca068c40bc43f1690aa02d3 (patch) | |
| tree | e2efe59e17d2bf787400f46f0249c511126d6025 /arch/arm/mach-shmobile/board-ag5evm.c | |
| parent | f4ef084226f82ca923bf0a2658bb2876bd215ec1 (diff) | |
| parent | 05a7929f31a0d516a9c19012bf27a1ea5058dc7a (diff) | |
| download | linux-f49cc57cc9d1686bdca068c40bc43f1690aa02d3.tar.gz linux-f49cc57cc9d1686bdca068c40bc43f1690aa02d3.tar.bz2 linux-f49cc57cc9d1686bdca068c40bc43f1690aa02d3.zip | |
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x:
ARM: mach-shmobile: mackerel: tidyup usbhs driver settings
ARM: mach-shmobile: Correct SCIF port types for SH7367.
ARM: mach-shmobile: sh73a0 gic_arch_extn.irq_set_wake() fix
ARM: mach-shmobile: Mackerel USB platform data update
ARM: mach-shmobile: AG5EVM SDHI1 platform data update
Diffstat (limited to 'arch/arm/mach-shmobile/board-ag5evm.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ag5evm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c index c95258c274c1..1e2aba23e0d6 100644 --- a/arch/arm/mach-shmobile/board-ag5evm.c +++ b/arch/arm/mach-shmobile/board-ag5evm.c @@ -382,10 +382,8 @@ void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state) } static struct sh_mobile_sdhi_info sh_sdhi1_platdata = { - .dma_slave_tx = SHDMA_SLAVE_SDHI1_TX, - .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX, .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, - .tmio_caps = MMC_CAP_NONREMOVABLE, + .tmio_caps = MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ, .tmio_ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, .set_pwr = ag5evm_sdhi1_set_pwr, }; |