diff options
author | Shawn Guo <shawn.guo@freescale.com> | 2014-07-01 04:03:00 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-07-18 04:11:33 -0400 |
commit | 8756dd924df6f4199368bee426dc8b2da0cfc6d6 (patch) | |
tree | 77ae3c2d90e68b85596253c4b4a509de67482da6 /arch/arm | |
parent | a49fb63c87f743c1166a2b0a20f80fcb0cbd02b2 (diff) |
ARM: imx: mark .dt_compat as const
Otherwise GCC will mark the .init.rodata section R/W, which causes
a compile error once we add other real R/O data.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-imx/imx31-dt.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/imx35-dt.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-imx50.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-imx51.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-imx53.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-imx6sl.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-imx6sx.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-vf610.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-imx/imx31-dt.c b/arch/arm/mach-imx/imx31-dt.c index 581f4d6c9b8a..418dbc82adc4 100644 --- a/arch/arm/mach-imx/imx31-dt.c +++ b/arch/arm/mach-imx/imx31-dt.c | |||
@@ -25,7 +25,7 @@ static void __init imx31_dt_init(void) | |||
25 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 25 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
26 | } | 26 | } |
27 | 27 | ||
28 | static const char *imx31_dt_board_compat[] __initconst = { | 28 | static const char * const imx31_dt_board_compat[] __initconst = { |
29 | "fsl,imx31", | 29 | "fsl,imx31", |
30 | NULL | 30 | NULL |
31 | }; | 31 | }; |
diff --git a/arch/arm/mach-imx/imx35-dt.c b/arch/arm/mach-imx/imx35-dt.c index a62854c59240..584fbe105579 100644 --- a/arch/arm/mach-imx/imx35-dt.c +++ b/arch/arm/mach-imx/imx35-dt.c | |||
@@ -34,7 +34,7 @@ static void __init imx35_irq_init(void) | |||
34 | mx35_init_irq(); | 34 | mx35_init_irq(); |
35 | } | 35 | } |
36 | 36 | ||
37 | static const char *imx35_dt_board_compat[] __initconst = { | 37 | static const char * const imx35_dt_board_compat[] __initconst = { |
38 | "fsl,imx35", | 38 | "fsl,imx35", |
39 | NULL | 39 | NULL |
40 | }; | 40 | }; |
diff --git a/arch/arm/mach-imx/mach-imx50.c b/arch/arm/mach-imx/mach-imx50.c index 62a4d4580291..b1e56a94a382 100644 --- 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) | |||
23 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 23 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
24 | } | 24 | } |
25 | 25 | ||
26 | static const char *imx50_dt_board_compat[] __initconst = { | 26 | static const char * const imx50_dt_board_compat[] __initconst = { |
27 | "fsl,imx50", | 27 | "fsl,imx50", |
28 | NULL | 28 | NULL |
29 | }; | 29 | }; |
diff --git a/arch/arm/mach-imx/mach-imx51.c b/arch/arm/mach-imx/mach-imx51.c index b6f42f80aae2..c77deb3f0893 100644 --- a/arch/arm/mach-imx/mach-imx51.c +++ b/arch/arm/mach-imx/mach-imx51.c | |||
@@ -67,7 +67,7 @@ static void __init imx51_init_late(void) | |||
67 | imx51_pm_init(); | 67 | imx51_pm_init(); |
68 | } | 68 | } |
69 | 69 | ||
70 | static const char *imx51_dt_board_compat[] __initconst = { | 70 | static const char * const imx51_dt_board_compat[] __initconst = { |
71 | "fsl,imx51", | 71 | "fsl,imx51", |
72 | NULL | 72 | NULL |
73 | }; | 73 | }; |
diff --git a/arch/arm/mach-imx/mach-imx53.c b/arch/arm/mach-imx/mach-imx53.c index d8c3c08354f6..03a0b40793d6 100644 --- a/arch/arm/mach-imx/mach-imx53.c +++ b/arch/arm/mach-imx/mach-imx53.c | |||
@@ -41,7 +41,7 @@ static void __init imx53_init_late(void) | |||
41 | imx53_pm_init(); | 41 | imx53_pm_init(); |
42 | } | 42 | } |
43 | 43 | ||
44 | static const char *imx53_dt_board_compat[] __initconst = { | 44 | static const char * const imx53_dt_board_compat[] __initconst = { |
45 | "fsl,imx53", | 45 | "fsl,imx53", |
46 | NULL | 46 | NULL |
47 | }; | 47 | }; |
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 9b3a233cfc2b..d51c6e99a2e9 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c | |||
@@ -396,7 +396,7 @@ static void __init imx6q_init_irq(void) | |||
396 | irqchip_init(); | 396 | irqchip_init(); |
397 | } | 397 | } |
398 | 398 | ||
399 | static const char *imx6q_dt_compat[] __initconst = { | 399 | static const char * const imx6q_dt_compat[] __initconst = { |
400 | "fsl,imx6dl", | 400 | "fsl,imx6dl", |
401 | "fsl,imx6q", | 401 | "fsl,imx6q", |
402 | NULL, | 402 | NULL, |
diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c index ad323385115c..ed263a21d928 100644 --- a/arch/arm/mach-imx/mach-imx6sl.c +++ b/arch/arm/mach-imx/mach-imx6sl.c | |||
@@ -70,7 +70,7 @@ static void __init imx6sl_init_irq(void) | |||
70 | irqchip_init(); | 70 | irqchip_init(); |
71 | } | 71 | } |
72 | 72 | ||
73 | static const char *imx6sl_dt_compat[] __initconst = { | 73 | static const char * const imx6sl_dt_compat[] __initconst = { |
74 | "fsl,imx6sl", | 74 | "fsl,imx6sl", |
75 | NULL, | 75 | NULL, |
76 | }; | 76 | }; |
diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c index 74ff7d650f8a..673a734165ba 100644 --- a/arch/arm/mach-imx/mach-imx6sx.c +++ b/arch/arm/mach-imx/mach-imx6sx.c | |||
@@ -44,7 +44,7 @@ static void __init imx6sx_init_late(void) | |||
44 | imx6q_cpuidle_init(); | 44 | imx6q_cpuidle_init(); |
45 | } | 45 | } |
46 | 46 | ||
47 | static const char *imx6sx_dt_compat[] __initconst = { | 47 | static const char * const imx6sx_dt_compat[] __initconst = { |
48 | "fsl,imx6sx", | 48 | "fsl,imx6sx", |
49 | NULL, | 49 | NULL, |
50 | }; | 50 | }; |
diff --git a/arch/arm/mach-imx/mach-vf610.c b/arch/arm/mach-imx/mach-vf610.c index c44602758120..ee7e57b752a7 100644 --- a/arch/arm/mach-imx/mach-vf610.c +++ b/arch/arm/mach-imx/mach-vf610.c | |||
@@ -20,7 +20,7 @@ static void __init vf610_init_machine(void) | |||
20 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 20 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
21 | } | 21 | } |
22 | 22 | ||
23 | static const char *vf610_dt_compat[] __initconst = { | 23 | static const char * const vf610_dt_compat[] __initconst = { |
24 | "fsl,vf610", | 24 | "fsl,vf610", |
25 | NULL, | 25 | NULL, |
26 | }; | 26 | }; |