diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-08-06 16:10:45 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-08-06 16:10:45 -0500 |
| commit | f063e0f9c722e8ea3d477020619c0e408a850d69 (patch) | |
| tree | a9087f66013f112fbf005e78f42662249fd32165 | |
| parent | 8d883f0268b23fa3081cc4cdff45eb002d7e65b6 (diff) | |
| parent | 98cd90d2d2cf32845fc2ba593a66bb0219ba8c3a (diff) | |
Merge branch 'omap4_next_l24.8' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into L24x8p4
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index b3354c0f815c..17ebbf01fa2c 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2326,6 +2326,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) " clk failed\n"); } +#if 0 ctrlr_caps = OMAP_HSMMC_READ(host, CAPA); if (ctrlr_caps & CAPA_ADMA_SUPPORT) { /* FIXME: passing the device structure fails @@ -2338,6 +2339,9 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) } else { host->dma_type = SDMA_XFER; } +#endif + host->dma_type = SDMA_XFER; + dev_dbg(mmc_dev(host->mmc), "DMA Mode=%d\n", host->dma_type); /* Since we do only SG emulation, we can have as many segs |