diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /arch/arm/mach-msm/devices-msm7x00.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/mach-msm/devices-msm7x00.c')
| -rw-r--r-- | arch/arm/mach-msm/devices-msm7x00.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c index fde9d8f69f10..4e8c0bcdc92d 100644 --- a/arch/arm/mach-msm/devices-msm7x00.c +++ b/arch/arm/mach-msm/devices-msm7x00.c | |||
| @@ -322,7 +322,8 @@ static struct platform_device *msm_sdcc_devices[] __initdata = { | |||
| 322 | &msm_device_sdc4, | 322 | &msm_device_sdc4, |
| 323 | }; | 323 | }; |
| 324 | 324 | ||
| 325 | int __init msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat, | 325 | int __init msm_add_sdcc(unsigned int controller, |
| 326 | struct msm_mmc_platform_data *plat, | ||
| 326 | unsigned int stat_irq, unsigned long stat_irq_flags) | 327 | unsigned int stat_irq, unsigned long stat_irq_flags) |
| 327 | { | 328 | { |
| 328 | struct platform_device *pdev; | 329 | struct platform_device *pdev; |