summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-11-27 17:28:10 +0100
committerArnd Bergmann <arnd@arndb.de>2015-11-27 17:28:10 +0100
commit97a586d2e3e177d62e4bc67b83bf2a840ca68530 (patch)
treebecf1307bc038578c93a769fc5a992634277d859
parent5597afad8d0d36d945ada45bbc8fed415f939a04 (diff)
parentc29d387b0bffb3ccce76e4fcdad9bfa7344ba338 (diff)
downloadlinux-97a586d2e3e177d62e4bc67b83bf2a840ca68530.tar.bz2
Merge tag 'renesas-fixes-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Merge "Renesas ARM Based SoC Fixes for v4.4" from Simon Horman: * r8a7793 SoC: Annotate r8a7793_boards_compat_dt with __initconst Aside from being correct this builds that otherwise fail with section mismatch errors. * tag 'renesas-fixes-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7793: proper constness with __initconst
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7793.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7793.c b/arch/arm/mach-shmobile/setup-r8a7793.c
index 1d2825cb7a65..5fce87f7f254 100644
--- a/arch/arm/mach-shmobile/setup-r8a7793.c
+++ b/arch/arm/mach-shmobile/setup-r8a7793.c
@@ -19,7 +19,7 @@
#include "common.h"
#include "rcar-gen2.h"
-static const char *r8a7793_boards_compat_dt[] __initconst = {
+static const char * const r8a7793_boards_compat_dt[] __initconst = {
"renesas,r8a7793",
NULL,
};