diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-02-20 17:24:50 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-02-22 17:42:42 +0100 |
| commit | 01a6e1267e741a91c6cdb4604cd2f898166e03f0 (patch) | |
| tree | 778f1a3b98e33da1b1becb0eb75e829dc30fec29 | |
| parent | Merge tag 'at91-ab-4.16-soc-fixes' of ssh://gitolite.kernel.org/pub/scm/linux... (diff) | |
| download | linux-01a6e1267e741a91c6cdb4604cd2f898166e03f0.tar.xz linux-01a6e1267e741a91c6cdb4604cd2f898166e03f0.zip | |
ARM: clps711x: mark clps711x_compat as const
The array of string pointers is put in __initconst, and the strings themselves
are marke 'const' but the the pointers are not, which caused a warning when
built with LTO:
arch/arm/mach-clps711x/board-dt.c:72:20: error: 'clps711x_compat' causes a section type conflict with 'feroceon_ids'
static const char *clps711x_compat[] __initconst = {
This marks the array itself const as well, which was certainly the
intention originally.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-clps711x/board-dt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/board-dt.c b/arch/arm/mach-clps711x/board-dt.c index ee1f83b1a332..4c89a8e9a2e3 100644 --- a/arch/arm/mach-clps711x/board-dt.c +++ b/arch/arm/mach-clps711x/board-dt.c @@ -69,7 +69,7 @@ static void clps711x_restart(enum reboot_mode mode, const char *cmd) soft_restart(0); } -static const char *clps711x_compat[] __initconst = { +static const char *const clps711x_compat[] __initconst = { "cirrus,ep7209", NULL }; |