Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

[net-next-2.6.git] / drivers / mmc / host / msm_sdcc.c

diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 60e424ebce5b16704292202ec19c3d55be59fc66..ff7752348b113cd154582187372e658784f66dc2 100644 (file)
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1049,7 +1049,7 @@ msmsdcc_init_dma(struct msmsdcc_host *host)
 static int
 msmsdcc_probe(struct platform_device *pdev)
 {
-       struct mmc_platform_data *plat = pdev->dev.platform_data;
+       struct msm_mmc_platform_data *plat = pdev->dev.platform_data;
        struct msmsdcc_host *host;
        struct mmc_host *mmc;
        struct resource *cmd_irqres = NULL;
@@ -1118,15 +1118,6 @@ msmsdcc_probe(struct platform_device *pdev)
        host->dmares = dmares;
        spin_lock_init(&host->lock);
 
-#ifdef CONFIG_MMC_EMBEDDED_SDIO
-       if (plat->embedded_sdio)
-               mmc_set_embedded_sdio_data(mmc,
-                                          &plat->embedded_sdio->cis,
-                                          &plat->embedded_sdio->cccr,
-                                          plat->embedded_sdio->funcs,
-                                          plat->embedded_sdio->num_funcs);
-#endif
-
        /*
         * Setup DMA
         */