diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 13:07:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 13:07:32 -0400 |
| commit | ce4327d372af7e2f2d403286e9904ab012e72827 (patch) | |
| tree | aa95c33aa9277d3ecb4d7c46cee13c8b59611c7c /drivers/mmc/host/msm_sdcc.h | |
| parent | 4032816dca04141e3d49ec4ed717c9f7cc5444c5 (diff) | |
| parent | b5d643de3ea28d7844a3a1a00a0a6f50897a2a6b (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.h')
| -rw-r--r-- | drivers/mmc/host/msm_sdcc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/msm_sdcc.h b/drivers/mmc/host/msm_sdcc.h index d7dedcf33b5b..ff2b0f74f6f4 100644 --- a/drivers/mmc/host/msm_sdcc.h +++ b/drivers/mmc/host/msm_sdcc.h | |||
| @@ -225,7 +225,7 @@ struct msmsdcc_host { | |||
| 225 | 225 | ||
| 226 | u32 pwr; | 226 | u32 pwr; |
| 227 | u32 saved_irq0mask; /* MMCIMASK0 reg value */ | 227 | u32 saved_irq0mask; /* MMCIMASK0 reg value */ |
| 228 | struct mmc_platform_data *plat; | 228 | struct msm_mmc_platform_data *plat; |
| 229 | 229 | ||
| 230 | struct timer_list timer; | 230 | struct timer_list timer; |
| 231 | unsigned int oldstat; | 231 | unsigned int oldstat; |