summaryrefslogtreecommitdiff
path: root/arch/arm/mach-nspire
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2015-02-18 23:01:45 +0300
committerArnd Bergmann <arnd@arndb.de>2015-02-19 11:44:17 +0300
commit543c5040f564c80fe59ae82a60fc061055d04a41 (patch)
tree40f47351a06a1d8e54f0956803e58cdcfe09bb8a /arch/arm/mach-nspire
parentd88d6cfc912e9e54f9ec0337a84691436c654077 (diff)
downloadlinux-543c5040f564c80fe59ae82a60fc061055d04a41.tar.xz
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-nspire')
-rw-r--r--arch/arm/mach-nspire/nspire.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-nspire/nspire.c b/arch/arm/mach-nspire/nspire.c
index 3d24ebf12095..3445a5686805 100644
--- a/arch/arm/mach-nspire/nspire.c
+++ b/arch/arm/mach-nspire/nspire.c
@@ -27,7 +27,7 @@
#include "mmio.h"
#include "clcd.h"
-static const char *nspire_dt_match[] __initconst = {
+static const char *const nspire_dt_match[] __initconst = {
"ti,nspire",
"ti,nspire-cx",
"ti,nspire-tp",