Merge branch 'for-upstream' of git://openrisc.net/jonas/linux

[pandora-kernel.git] / arch / arm / mach-mx5 / board-mx51_efikasb.c

diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c
index db04ce8..4b2e522 100644 (file)
--- a/arch/arm/mach-mx5/board-mx51_efikasb.c
+++ b/arch/arm/mach-mx5/board-mx51_efikasb.c
@@ -22,7 +22,6 @@
 #include <linux/input.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/fsl_devices.h>
 #include <linux/spi/flash.h>
 #include <linux/spi/spi.h>
 #include <linux/mfd/mc13892.h>
@@ -35,8 +34,6 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx51.h>
-#include <mach/i2c.h>
-#include <mach/mxc_ehci.h>
 
 #include <asm/irq.h>
 #include <asm/setup.h>
@@ -251,6 +248,8 @@ static void __init mx51_efikasb_board_id(void)
 
 static void __init efikasb_board_init(void)
 {
+       imx51_soc_init();
+
        mxc_iomux_v3_setup_multiple_pads(mx51efikasb_pads,
                                        ARRAY_SIZE(mx51efikasb_pads));
        efika_board_common_init();
@@ -260,7 +259,7 @@ static void __init efikasb_board_init(void)
        imx51_add_sdhci_esdhc_imx(1, NULL);
 
        platform_device_register(&mx51_efikasb_leds_device);
-       imx51_add_gpio_keys(&mx51_efikasb_keys_data);
+       imx_add_gpio_keys(&mx51_efikasb_keys_data);
 
 }