Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / arch / arm / mach-imx / mach-imx51.c

diff --git a/arch/arm/mach-imx/mach-imx51.c b/arch/arm/mach-imx/mach-imx51.c
index a2027d298a3f6887ae5d21f6b5f8a058b358309a..c77deb3f08939f50304797ea5ac1c1b17983fef7 100644 (file)
--- a/arch/arm/mach-imx/mach-imx51.c
+++ b/arch/arm/mach-imx/mach-imx51.c
@@ -19,7 +19,6 @@
 
 #include "common.h"
 #include "hardware.h"
-#include "mx51.h"
 
 static void __init imx51_init_early(void)
 {
@@ -68,13 +67,12 @@ static void __init imx51_init_late(void)
        imx51_pm_init();
 }
 
-static const char *imx51_dt_board_compat[] __initconst = {
+static const char * const imx51_dt_board_compat[] __initconst = {
        "fsl,imx51",
        NULL
 };
 
 DT_MACHINE_START(IMX51_DT, "Freescale i.MX51 (Device Tree Support)")
-       .map_io         = mx51_map_io,
        .init_early     = imx51_init_early,
        .init_irq       = tzic_init_irq,
        .init_machine   = imx51_dt_init,