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

Arnd Bergmann committed 10 years ago

Commit 97a586d2 parents 5597afa c29d3871 file · +1 −1Browse files

Unified · Split

arch/arm/mach-shmobile/setup-r8a7793.c+1−1

@@ -19,7 +19,7 @@ · 18 unmodified lines
19	19	#include "common.h"
20	20	#include "rcar-gen2.h"
21	21
22		−static const char *r8a7793_boards_compat_dt[] __initconst = {
	22	+static const char * const r8a7793_boards_compat_dt[] __initconst = {
23	23	"renesas,r8a7793",
24	24	NULL,
25	25	};