Merge remote-tracking branch 'agust/next' into next

[karo-tx-linux.git] / arch / arm / mach-imx / mach-imx50.c

diff --git a/arch/arm/mach-imx/mach-imx50.c b/arch/arm/mach-imx/mach-imx50.c
index 2f74fad54196761c0c3b8bdf62887edd94fe31da..77b77a92bb5d783e7145b7b1d759589de678874f 100644 (file)
--- a/arch/arm/mach-imx/mach-imx50.c
+++ b/arch/arm/mach-imx/mach-imx50.c
@@ -23,7 +23,7 @@ static void __init imx50_dt_init(void)
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
-static const char *imx50_dt_board_compat[] __initdata = {
+static const char *imx50_dt_board_compat[] __initconst = {
        "fsl,imx50",
        NULL
 };