sections: fix section conflicts in arch/arm/

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
index ac4e003ad863..be3099733b1f 100644
--- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
+++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -88,7 +88,7 @@ static struct davinci_mmc_config mmc_config = {
         .version        = MMC_CTLR_VERSION_1,
 };
 
-static const short sdio1_pins[] __initdata = {
+static const short sdio1_pins[] __initconst = {
         TNETV107X_SDIO1_CLK_1,          TNETV107X_SDIO1_CMD_1,
         TNETV107X_SDIO1_DATA0_1,        TNETV107X_SDIO1_DATA1_1,
         TNETV107X_SDIO1_DATA2_1,        TNETV107X_SDIO1_DATA3_1,
@@ -96,12 +96,12 @@ static const short sdio1_pins[] __initdata = {
         -1
 };
 
-static const short uart1_pins[] __initdata = {
+static const short uart1_pins[] __initconst = {
         TNETV107X_UART1_RD,             TNETV107X_UART1_TD,
         -1
 };
 
-static const short ssp_pins[] __initdata = {
+static const short ssp_pins[] __initconst = {
         TNETV107X_SSP0_0, TNETV107X_SSP0_1, TNETV107X_SSP0_2,
         TNETV107X_SSP1_0, TNETV107X_SSP1_1, TNETV107X_SSP1_2,
         TNETV107X_SSP1_3, -1