diff options
author | Sahitya Tummala <stummala@codeaurora.org> | 2010-07-29 07:25:34 -0400 |
---|---|---|
committer | Daniel Walker <dwalker@codeaurora.org> | 2010-08-09 18:48:23 -0400 |
commit | b5d643de3ea28d7844a3a1a00a0a6f50897a2a6b (patch) | |
tree | 1c3cf983d43b386a64c930332862fd306395015f /arch/arm/mach-msm/include | |
parent | 28d6c3db679dc83a0e77b5a540afb0594bdb7056 (diff) |
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.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/mmc.h | 2 |
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 a3efb0dc6dd6..5a79bcf50413 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); | |||
41 | void __init msm_init_gpio(void); | 41 | void __init msm_init_gpio(void); |
42 | void __init msm_clock_init(struct clk *clock_tbl, unsigned num_clocks); | 42 | void __init msm_clock_init(struct clk *clock_tbl, unsigned num_clocks); |
43 | void __init msm_acpu_clock_init(struct msm_acpu_clock_platform_data *); | 43 | void __init msm_acpu_clock_init(struct msm_acpu_clock_platform_data *); |
44 | int __init msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat, | 44 | int __init msm_add_sdcc(unsigned int controller, |
45 | struct msm_mmc_platform_data *plat, | ||
45 | unsigned int stat_irq, unsigned long stat_irq_flags); | 46 | unsigned int stat_irq, unsigned long stat_irq_flags); |
46 | 47 | ||
47 | #endif | 48 | #endif |
diff --git a/arch/arm/mach-msm/include/mach/mmc.h b/arch/arm/mach-msm/include/mach/mmc.h index 0ecf25426284..d54b6b086cff 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 { | |||
15 | int num_funcs; | 15 | int num_funcs; |
16 | }; | 16 | }; |
17 | 17 | ||
18 | struct mmc_platform_data { | 18 | struct msm_mmc_platform_data { |
19 | unsigned int ocr_mask; /* available voltages */ | 19 | unsigned int ocr_mask; /* available voltages */ |
20 | u32 (*translate_vdd)(struct device *, unsigned int); | 20 | u32 (*translate_vdd)(struct device *, unsigned int); |
21 | unsigned int (*status)(struct device *); | 21 | unsigned int (*status)(struct device *); |