diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-14 20:02:09 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-14 20:02:09 +0800 |
| commit | 704867ede0c3645075ff3438d1a4fd4977abaa8d (patch) | |
| tree | fc89b31764132dc1b07e0af3e53219005cfb8f95 /arch/arm/mach-mxs/mach-mx28evk.c | |
| parent | 681ba97d9fbff59f67c71f1d9a88ad0b8ef49d25 (diff) | |
| parent | cfe04478fa1b472264b7fe9bbf547710aa344d3c (diff) | |
Merge branch 'mfd/da9052' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into regmap-next
Diffstat (limited to 'arch/arm/mach-mxs/mach-mx28evk.c')
| -rw-r--r-- | arch/arm/mach-mxs/mach-mx28evk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c index ac2316d53d3c..064ec5abaa55 100644 --- a/arch/arm/mach-mxs/mach-mx28evk.c +++ b/arch/arm/mach-mxs/mach-mx28evk.c @@ -471,7 +471,8 @@ static void __init mx28evk_init(void) "mmc0-slot-power"); if (ret) pr_warn("failed to request gpio mmc0-slot-power: %d\n", ret); - mx28_add_mxs_mmc(0, &mx28evk_mmc_pdata[0]); + else + mx28_add_mxs_mmc(0, &mx28evk_mmc_pdata[0]); ret = gpio_request_one(MX28EVK_MMC1_SLOT_POWER, GPIOF_OUT_INIT_LOW, "mmc1-slot-power"); @@ -480,7 +481,6 @@ static void __init mx28evk_init(void) else mx28_add_mxs_mmc(1, &mx28evk_mmc_pdata[1]); - mx28_add_mxs_mmc(1, &mx28evk_mmc_pdata[1]); mx28_add_rtc_stmp3xxx(); gpio_led_register_device(0, &mx28evk_led_data); |