diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 10:07:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 10:07:32 -0700 |
| commit | ce4327d372af7e2f2d403286e9904ab012e72827 (patch) | |
| tree | aa95c33aa9277d3ecb4d7c46cee13c8b59611c7c /drivers | |
| parent | 4032816dca04141e3d49ec4ed717c9f7cc5444c5 (diff) | |
| parent | b5d643de3ea28d7844a3a1a00a0a6f50897a2a6b (diff) | |
| download | linux-3.10-ce4327d372af7e2f2d403286e9904ab012e72827.tar.gz linux-3.10-ce4327d372af7e2f2d403286e9904ab012e72827.tar.bz2 linux-3.10-ce4327d372af7e2f2d403286e9904ab012e72827.zip | |
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')
| -rw-r--r-- | drivers/mmc/host/msm_sdcc.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/msm_sdcc.h | 2 |
2 files changed, 2 insertions, 2 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; diff --git a/drivers/mmc/host/msm_sdcc.h b/drivers/mmc/host/msm_sdcc.h index d7dedcf33b5..ff2b0f74f6f 100644 --- a/drivers/mmc/host/msm_sdcc.h +++ b/drivers/mmc/host/msm_sdcc.h @@ -225,7 +225,7 @@ struct msmsdcc_host { u32 pwr; u32 saved_irq0mask; /* MMCIMASK0 reg value */ - struct mmc_platform_data *plat; + struct msm_mmc_platform_data *plat; struct timer_list timer; unsigned int oldstat; |