diff --git a/[refs] b/[refs] index b8fca3c93aa0..388bd6ad407b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c2b8f26eb8b54203e0e7834e0f7a11a7ae15ef1 +refs/heads/master: 95c7348d948dc4832434ddfaeba804ac14732f02 diff --git a/trunk/drivers/mmc/host/tmio_mmc_dma.c b/trunk/drivers/mmc/host/tmio_mmc_dma.c index 25f1ad6cbe09..9c4da6637503 100644 --- a/trunk/drivers/mmc/host/tmio_mmc_dma.c +++ b/trunk/drivers/mmc/host/tmio_mmc_dma.c @@ -26,7 +26,7 @@ static void tmio_mmc_enable_dma(struct tmio_mmc_host *host, bool enable) { #if defined(CONFIG_SUPERH) || defined(CONFIG_ARCH_SHMOBILE) /* Switch DMA mode on or off - SuperH specific? */ - writew(enable ? 2 : 0, host->ctl + (0xd8 << host->bus_shift)); + writew(enable ? 2 : 0, host->ctl + (CTL_DMA_ENABLE << host->bus_shift)); #endif } diff --git a/trunk/include/linux/mmc/tmio.h b/trunk/include/linux/mmc/tmio.h index 551490f0613d..3ae377623db0 100644 --- a/trunk/include/linux/mmc/tmio.h +++ b/trunk/include/linux/mmc/tmio.h @@ -30,6 +30,7 @@ #define CTL_TRANSACTION_CTL 0x34 #define CTL_SDIO_STATUS 0x36 #define CTL_SDIO_IRQ_MASK 0x38 +#define CTL_DMA_ENABLE 0xd8 #define CTL_RESET_SD 0xe0 #define CTL_SDIO_REGS 0x100 #define CTL_CLK_AND_WAIT_CTL 0x138