diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-02-20 17:24:52 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-02-22 17:43:16 +0100 |
commit | eec51afc9d2612c65523627cfd81456c6995a79a (patch) | |
tree | c9fc34fe08d6f2e41172df64d99330bb00fb4449 /arch/arm/mach-davinci/board-dm355-evm.c | |
parent | 01a6e1267e741a91c6cdb4604cd2f898166e03f0 (diff) | |
download | talos-obmc-linux-eec51afc9d2612c65523627cfd81456c6995a79a.tar.gz talos-obmc-linux-eec51afc9d2612c65523627cfd81456c6995a79a.zip |
ARM: davinci: mark spi_board_info arrays as const
Building with LTO revealed that three spi_board_info arrays are marked
__initconst, but not const:
arch/arm/mach-davinci/board-dm365-evm.c: In function 'dm365_evm_init':
arch/arm/mach-davinci/board-dm365-evm.c:729:30: error: 'dm365_evm_spi_info' causes a section type conflict with 'dm646x_edma_device'
static struct spi_board_info dm365_evm_spi_info[] __initconst = {
^
arch/arm/mach-davinci/dm646x.c:603:42: note: 'dm646x_edma_device' was declared here
static const struct platform_device_info dm646x_edma_device __initconst = {
This marks them const as well, as was originally intended.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-davinci/board-dm355-evm.c')
-rw-r--r-- | arch/arm/mach-davinci/board-dm355-evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index e457f299cd44..d6b11907380c 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c @@ -368,7 +368,7 @@ static struct spi_eeprom at25640a = { .flags = EE_ADDR2, }; -static struct spi_board_info dm355_evm_spi_info[] __initconst = { +static const struct spi_board_info dm355_evm_spi_info[] __initconst = { { .modalias = "at25", .platform_data = &at25640a, |