Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6

[~andy/linux] / arch / arm / mach-mx5 / mx51_efika.c

diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c
index d5bf95825533c69c08412f5b7848f646badcddb8..ec6ca91b299b629039ff3ac13ed7942494b3b830 100644 (file)
--- a/arch/arm/mach-mx5/mx51_efika.c
+++ b/arch/arm/mach-mx5/mx51_efika.c
@@ -565,7 +565,7 @@ static struct mc13xxx_regulator_init_data mx51_efika_regulators[] = {
 };
 
 static struct mc13xxx_platform_data mx51_efika_mc13892_data = {
-       .flags = MC13XXX_USE_RTC | MC13XXX_USE_REGULATOR,
+       .flags = MC13XXX_USE_RTC,
        .regulators = {
                .num_regulators = ARRAY_SIZE(mx51_efika_regulators),
                .regulators = mx51_efika_regulators,
@@ -607,7 +607,6 @@ void __init efika_board_common_init(void)
                                        ARRAY_SIZE(mx51efika_pads));
        imx51_add_imx_uart(0, &uart_pdata);
        mx51_efika_usb();
-       imx51_add_sdhci_esdhc_imx(0, NULL);
 
        /* FIXME: comes from original code. check this. */
        if (mx51_revision() < IMX_CHIP_REVISION_2_0)
@@ -625,6 +624,8 @@ void __init efika_board_common_init(void)
                ARRAY_SIZE(mx51_efika_spi_board_info));
        imx51_add_ecspi(0, &mx51_efika_spi_pdata);
 
+       imx51_add_pata_imx();
+
 #if defined(CONFIG_CPU_FREQ_IMX)
        get_cpu_op = mx51_get_cpu_op;
 #endif