summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/msm_sdcc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 10:07:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 10:07:32 -0700
commitce4327d372af7e2f2d403286e9904ab012e72827 (patch)
treeaa95c33aa9277d3ecb4d7c46cee13c8b59611c7c /drivers/mmc/host/msm_sdcc.c
parent4032816dca04141e3d49ec4ed717c9f7cc5444c5 (diff)
parentb5d643de3ea28d7844a3a1a00a0a6f50897a2a6b (diff)
Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
* 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm: msm: mmc: Add msm prefix to platform data structure msm: trout: Remove extern declaration from source file arm: msm: Fix section mismatch in smd.c. arm: msm: trout add mmc support arm: msm: trout: add trout specific gpio interrupts arm: msm: remove unused #include <linux/version.h>
Diffstat (limited to 'drivers/mmc/host/msm_sdcc.c')
-rw-r--r--drivers/mmc/host/msm_sdcc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 3bd8ff71ec2..6824917f5c6 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1060,7 +1060,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;