diff options
author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:39 -0400 |
commit | 3cf5ae6e64507541ce00893e6459da3ef3d4fd6b (patch) | |
tree | 4cb0d29301b7f9916a432ae6b4baa0d120032e20 /arch/mips/bcm63xx | |
parent | dd47a8bd6e43e3112ea0fa89994b91c433d130c2 (diff) |
sections: fix section conflicts in arch/mips
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mips/bcm63xx')
-rw-r--r-- | arch/mips/bcm63xx/boards/board_bcm963xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index feb05258a4d1..dd18e4b761a8 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c | |||
@@ -632,7 +632,7 @@ static struct board_info __initdata board_DWVS0 = { | |||
632 | /* | 632 | /* |
633 | * all boards | 633 | * all boards |
634 | */ | 634 | */ |
635 | static const struct board_info __initdata *bcm963xx_boards[] = { | 635 | static const struct board_info __initconst *bcm963xx_boards[] = { |
636 | #ifdef CONFIG_BCM63XX_CPU_6328 | 636 | #ifdef CONFIG_BCM63XX_CPU_6328 |
637 | &board_96328avng, | 637 | &board_96328avng, |
638 | #endif | 638 | #endif |