aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/include
diff options
context:
space:
mode:
authorSahitya Tummala <stummala@codeaurora.org>2010-07-29 16:55:34 +0530
committerDaniel Walker <dwalker@codeaurora.org>2010-08-09 15:48:23 -0700
commitb5d643de3ea28d7844a3a1a00a0a6f50897a2a6b (patch)
tree1c3cf983d43b386a64c930332862fd306395015f /arch/arm/mach-msm/include
parent28d6c3db679dc83a0e77b5a540afb0594bdb7056 (diff)
downloadkernel_samsung_smdk4412-b5d643de3ea28d7844a3a1a00a0a6f50897a2a6b.zip
kernel_samsung_smdk4412-b5d643de3ea28d7844a3a1a00a0a6f50897a2a6b.tar.gz
kernel_samsung_smdk4412-b5d643de3ea28d7844a3a1a00a0a6f50897a2a6b.tar.bz2
msm: mmc: Add msm prefix to platform data structure
Rename mmc_platform_data to msm_mmc_platform_data as it is used only by MSM platform. Signed-off-by: Sahitya Tummala <stummala@codeaurora.org> Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/include')
-rw-r--r--arch/arm/mach-msm/include/mach/board.h3
-rw-r--r--arch/arm/mach-msm/include/mach/mmc.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/include/mach/board.h b/arch/arm/mach-msm/include/mach/board.h
index a3efb0d..5a79bcf 100644
--- a/arch/arm/mach-msm/include/mach/board.h
+++ b/arch/arm/mach-msm/include/mach/board.h
@@ -41,7 +41,8 @@ void __init msm_init_irq(void);
void __init msm_init_gpio(void);
void __init msm_clock_init(struct clk *clock_tbl, unsigned num_clocks);
void __init msm_acpu_clock_init(struct msm_acpu_clock_platform_data *);
-int __init msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat,
+int __init msm_add_sdcc(unsigned int controller,
+ struct msm_mmc_platform_data *plat,
unsigned int stat_irq, unsigned long stat_irq_flags);
#endif
diff --git a/arch/arm/mach-msm/include/mach/mmc.h b/arch/arm/mach-msm/include/mach/mmc.h
index 0ecf254..d54b6b0 100644
--- a/arch/arm/mach-msm/include/mach/mmc.h
+++ b/arch/arm/mach-msm/include/mach/mmc.h
@@ -15,7 +15,7 @@ struct embedded_sdio_data {
int num_funcs;
};
-struct mmc_platform_data {
+struct msm_mmc_platform_data {
unsigned int ocr_mask; /* available voltages */
u32 (*translate_vdd)(struct device *, unsigned int);
unsigned int (*status)(struct device *);