diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 18:57:38 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 18:57:38 +0900 |
| commit | 59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (patch) | |
| tree | cbc0254ef952f10e99e384b56ccc7b81389e335e /drivers/mmc | |
| parent | 7d84b3e93757fe871d57b43c422b81cc8b94057a (diff) | |
| parent | c9312209aa9fdef05b03d63bbead63bb720fd133 (diff) | |
| download | blackbird-op-linux-59ca37f74a6e9d3e9367359f2fcbb286df7d9748.tar.gz blackbird-op-linux-59ca37f74a6e9d3e9367359f2fcbb286df7d9748.zip | |
Merge branch 'next/topic-dma-samsung' into next-samsung-devel
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/s3cmci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index a04f87d7ee3d..03cfdab99c8f 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -913,9 +913,9 @@ request_done: } static void s3cmci_dma_setup(struct s3cmci_host *host, - enum s3c2410_dmasrc source) + enum dma_data_direction source) { - static enum s3c2410_dmasrc last_source = -1; + static enum dma_data_direction last_source = -1; static int setup_ok; if (last_source == source) @@ -1087,7 +1087,7 @@ static int s3cmci_prepare_dma(struct s3cmci_host *host, struct mmc_data *data) BUG_ON((data->flags & BOTH_DIR) == BOTH_DIR); - s3cmci_dma_setup(host, rw ? S3C2410_DMASRC_MEM : S3C2410_DMASRC_HW); + s3cmci_dma_setup(host, rw ? DMA_TO_DEVICE : DMA_FROM_DEVICE); s3c2410_dma_ctrl(host->dma, S3C2410_DMAOP_FLUSH); dma_len = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len, |
