Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable

Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/include/mach/omap4-common.h
	arch/arm/plat-omap/include/plat/irqs.h

The changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved.  The now empty ifdef in irqs.h
was also eliminated.

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);