aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2015-02-18 15:01:45 -0500
committerArnd Bergmann <arnd@arndb.de>2015-02-19 03:44:17 -0500
commit543c5040f564c80fe59ae82a60fc061055d04a41 (patch)
tree40f47351a06a1d8e54f0956803e58cdcfe09bb8a /arch/arm/mach-exynos
parentd88d6cfc912e9e54f9ec0337a84691436c654077 (diff)
ARM: make arrays containing machine compatible strings const
The definition static const char *axxia_dt_match[] __initconst = { ... defines a changable array of constant strings. That is you must not do: *axxia_dt_match[0] = 'k'; but axxia_dt_match[0] = "different string"; is fine. So the annotation __initconst is wrong and yields a compiler error when other really const variables are added with __initconst. As the struct machine_desc member dt_compat is declared as const char *const *dt_compat; making the arrays const is the better alternative over changing all annotations to __initdata. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r--arch/arm/mach-exynos/exynos.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 2013f73797ed..9e9dfdfad9d7 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -227,7 +227,7 @@ static void __init exynos_dt_machine_init(void)
227 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); 227 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
228} 228}
229 229
230static char const *exynos_dt_compat[] __initconst = { 230static char const *const exynos_dt_compat[] __initconst = {
231 "samsung,exynos3", 231 "samsung,exynos3",
232 "samsung,exynos3250", 232 "samsung,exynos3250",
233 "samsung,exynos4", 233 "samsung,exynos4",