diff options
| author | Olof Johansson <olof@lixom.net> | 2011-11-09 08:59:26 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-11-09 08:59:26 -0800 |
| commit | 22d3832373e4965f11240dc8d7a0c512bd873437 (patch) | |
| tree | 7a5d6707a241b869604d20693486a0e64613bdc9 /arch | |
| parent | 19e0bafc36abd84a5b4d7c7745b78a6f4626e944 (diff) | |
| parent | e94e05eae9a56e4fad93f18a63ae90e7ff02b576 (diff) | |
| download | linux-stable-22d3832373e4965f11240dc8d7a0c512bd873437.tar.gz linux-stable-22d3832373e4965f11240dc8d7a0c512bd873437.tar.bz2 linux-stable-22d3832373e4965f11240dc8d7a0c512bd873437.zip | |
Merge branch 'mxs/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
Diffstat (limited to 'arch')
| -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); |