lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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>
This commit is contained in:
Linus Torvalds
2010-08-12 10:07:32 -07:00
parent 4032816dca b5d643de3e
commit ce4327d372
12 changed files with 323 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mmc/host/msm_sdcc.c
View File

@@ -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;

2
drivers/mmc/host/msm_sdcc.h
View File

@@ -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;